Skip to content

Commit ec5a93b

Browse files
authored
Merge pull request #31 from Twasi/develop
Release 1.2.0
2 parents e311d9a + 0eb0190 commit ec5a93b

File tree

16 files changed

+483
-268
lines changed

16 files changed

+483
-268
lines changed

.github/workflows/master.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Tag git version
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Git tag
14+
run: |
15+
git tag $(cat VERSION)
16+
git push --tags

.github/workflows/release.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Prepare release candidate
2+
3+
on:
4+
push:
5+
branches:
6+
- release/*
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v1
13+
- name: Set up JDK 1.8
14+
uses: actions/setup-java@v1
15+
with:
16+
java-version: 1.8
17+
- name: Gradle uploadArchives
18+
run: |
19+
./gradlew uploadArchives
20+
env:
21+
IS_RELEASE: "YES"
22+
PGP_KEY: ${{ secrets.PGP_KEY }}
23+
PGP_PSW: ${{ secrets.PGP_PSW }}
24+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
25+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.github/workflows/snapshot.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Snapshot build & publish
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v1
15+
- name: Set up JDK 1.8
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 1.8
19+
- name: Gradle uploadArchives
20+
run: |
21+
./gradlew uploadArchives
22+
env:
23+
PGP_KEY: ${{ secrets.PGP_KEY }}
24+
PGP_PSW: ${{ secrets.PGP_PSW }}
25+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
26+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
### Maven Plugins ###
1111
.flattened-pom.xml
1212

13+
# Gradle
14+
.gradle/
15+
build/
16+
1317
### Intellij ###
1418
**/.idea
1519
**/*.iml

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.2.0

build.gradle

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
plugins {
2+
id 'java'
3+
id 'java-library'
4+
id 'maven-publish'
5+
id 'maven'
6+
id 'signing'
7+
id 'org.unbroken-dome.test-sets' version '3.0.1'
8+
}
9+
10+
def isRelease = System.getenv('IS_RELEASE') == 'YES'
11+
12+
if (isRelease) {
13+
println("THIS IS A RELEASE BUILD! Artifacts will be staged on maven central.")
14+
}
15+
16+
group = 'net.twasi'
17+
version = rootProject.file('VERSION').text.trim() + (isRelease ? '' : '-SNAPSHOT')
18+
archivesBaseName = rootProject.name
19+
20+
java.sourceCompatibility = JavaVersion.VERSION_1_8
21+
22+
repositories {
23+
mavenLocal()
24+
jcenter()
25+
maven {
26+
url = uri('https://repo.maven.apache.org/maven2/')
27+
}
28+
}
29+
30+
dependencies {
31+
implementation 'org.eclipse.jetty.websocket:websocket-client:9.4.8.v20171121'
32+
implementation 'com.google.code.gson:gson:2.8.2'
33+
implementation 'org.slf4j:slf4j-api:1.7.30'
34+
implementation 'org.slf4j:slf4j-simple:1.7.30'
35+
36+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.0'
37+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.0.0'
38+
testImplementation 'org.assertj:assertj-core:3.18.1'
39+
}
40+
41+
java {
42+
withSourcesJar()
43+
// withJavadocJar()
44+
}
45+
46+
testSets {
47+
integrationTest
48+
}
49+
50+
test {
51+
useJUnitPlatform()
52+
}
53+
54+
integrationTest {
55+
useJUnitPlatform()
56+
}
57+
58+
task javadocJar(type: Jar) {
59+
classifier = 'javadoc'
60+
from javadoc
61+
}
62+
63+
artifacts {
64+
archives javadocJar, sourcesJar
65+
}
66+
67+
signing {
68+
def signingKey = System.getenv('PGP_KEY') ? System.getenv('PGP_KEY').replace("\\n", "\n") : ''
69+
def signingPassword = System.getenv('PGP_PSW')
70+
71+
useInMemoryPgpKeys(signingKey, signingPassword)
72+
73+
if (signingKey != '') {
74+
sign configurations.archives
75+
}
76+
}
77+
78+
def ossrhUsername = System.getenv('OSSRH_USERNAME')
79+
def ossrhPassword = System.getenv('OSSRH_PASSWORD')
80+
81+
uploadArchives {
82+
repositories {
83+
mavenDeployer {
84+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
85+
86+
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
87+
authentication(userName: ossrhUsername, password: ossrhPassword)
88+
}
89+
90+
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
91+
authentication(userName: ossrhUsername, password: ossrhPassword)
92+
}
93+
94+
pom.project {
95+
name 'websocket-obs-java'
96+
packaging 'jar'
97+
// optionally artifactId can be defined here
98+
description 'Library to connect to the OBS WebSocket interface.'
99+
url 'https://github.com/Twasi/obs-websocket-java'
100+
101+
scm {
102+
connection 'scm:git:git://github.com/Twasi/obs-websocket-java.git'
103+
developerConnection 'scm:git:[email protected]:Twasi/obs-websocket-java.git'
104+
url 'https://github.com/Twasi/obs-websocket-java'
105+
}
106+
107+
licenses {
108+
license {
109+
name 'MIT'
110+
url 'https://opensource.org/licenses/MIT'
111+
}
112+
}
113+
114+
developers {
115+
developer {
116+
name 'Lars Bärtschi'
117+
118+
}
119+
developer {
120+
name 'Merlin Westphal'
121+
122+
}
123+
}
124+
}
125+
}
126+
}
127+
}
128+
129+
tasks.withType(JavaCompile) {
130+
options.encoding = 'UTF-8'
131+
}

gradle/wrapper/gradle-wrapper.jar

57.8 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)