Skip to content

Commit b652ed3

Browse files
committed
Upgraded Gradle to 7.4.2 and updated dependencies
1 parent 03f6a2a commit b652ed3

File tree

4 files changed

+54
-51
lines changed

4 files changed

+54
-51
lines changed

build.gradle

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
11
plugins {
2-
id "com.github.hierynomus.license" version "0.11.0"
2+
id 'java-library'
3+
id 'jacoco'
4+
id 'signing'
5+
id 'maven-publish'
6+
id "com.github.hierynomus.license" version "0.16.1"
37
}
48

5-
apply plugin: 'java'
6-
apply plugin: 'maven'
7-
apply plugin: 'signing'
8-
apply plugin: 'idea'
9-
apply plugin: 'eclipse'
10-
apply plugin: 'license'
11-
apply plugin: 'jacoco'
12-
apply plugin: 'maven-publish'
13-
149
group = 'com.tokbox'
1510
archivesBaseName = 'opentok-server-sdk'
1611
version = '4.6.0'
1712

13+
sourceCompatibility = "1.8"
14+
targetCompatibility = "1.8"
15+
16+
repositories {
17+
mavenCentral()
18+
}
19+
20+
dependencies {
21+
testImplementation 'junit:junit:4.13.2'
22+
testImplementation 'com.github.tomakehurst:wiremock:1.58'
23+
implementation 'commons-lang:commons-lang:2.6'
24+
implementation 'commons-validator:commons-validator:1.7'
25+
implementation 'org.asynchttpclient:async-http-client:2.12.3'
26+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
27+
implementation 'commons-codec:commons-codec:1.15'
28+
implementation 'org.bitbucket.b_c:jose4j:0.7.11'
29+
}
30+
31+
task sourcesJar(type: Jar) {
32+
archiveClassifier.set("sources")
33+
from sourceSets.main.allSource
34+
}
35+
1836
task javadocJar(type: Jar) {
1937
archiveClassifier.set("javadoc")
2038
from javadoc
@@ -29,35 +47,16 @@ javadoc {
2947
}
3048
}
3149

50+
jacoco {
51+
toolVersion = "0.8.8"
52+
}
3253
jacocoTestReport {
3354
reports {
34-
xml.enabled true
35-
html.enabled false
55+
xml.getRequired().set(true)
56+
html.getRequired().set(true)
3657
}
3758
}
38-
39-
task sourcesJar(type: Jar) {
40-
archiveClassifier.set("sources")
41-
from sourceSets.main.allSource
42-
}
43-
44-
repositories {
45-
mavenCentral()
46-
}
47-
48-
dependencies {
49-
testCompile group: 'junit', name: 'junit', version: '[4.3,5.0]'
50-
testCompile group: 'com.github.tomakehurst', name: 'wiremock', version: '[1.45,2.0]'
51-
compile group: 'commons-lang', name: 'commons-lang', version: '[2.6,3.0]'
52-
compile group: 'org.asynchttpclient', name: 'async-http-client', version: '[2.0,2.99999)'
53-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '[2.3.1,2.99999)'
54-
compile group: 'commons-validator', name: 'commons-validator', version: '[1.4.0,1.99999)'
55-
compile group: 'commons-codec', name: 'commons-codec', version: '[1.9,1.99999]'
56-
compile group: 'org.bitbucket.b_c', name: 'jose4j', version: '[0.7,1.0)'
57-
// TODO: find out how to initialize these dependencies properly, or remove them
58-
//compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.5'
59-
//compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.5'
60-
}
59+
check.dependsOn jacocoTestReport
6160

6261
license {
6362
header rootProject.file('codequality/HEADER')
@@ -69,7 +68,6 @@ artifacts {
6968
}
7069

7170
ext.isReleaseVersion = hasProperty('isReleaseVersion') ? isReleaseVersion : false
72-
7371
ext.ossrhUsername = hasProperty('ossrhUsername') ? ossrhUsername : 'dummyuser'
7472
ext.ossrhPassword = hasProperty('ossrhPassword') ? ossrhPassword : 'dummypass'
7573

@@ -107,28 +105,34 @@ publishing {
107105
email = 'aoberoi@gmail.com'
108106
organization = 'Vonage'
109107
}
110-
developer{
108+
developer {
111109
id = 'slorello89'
112110
name = 'Steve Lorello'
113111
email = 'steve.lorello@vonage.com'
114112
organization = 'Vonage'
115113
}
114+
developer {
115+
id = 'SMadani'
116+
name = 'Sina Madani'
117+
email = 'sina.madani@vonage.com'
118+
organization = 'Vonage'
119+
}
116120
}
117121
scm {
118122
connection = "scm:git@github.com/opentok/opentok-java-sdk"
119123
developerConnection = "scm:git@github.com/opentok/opentok-java-sdk"
120124
url = "http://github.com/opentok/opentok-java-sdk"
121125
}
122126

123-
issueManagement{
127+
issueManagement {
124128
system = "GitHub"
125129
url = "https://http://github.com/opentok/opentok-java-sdk"
126130
}
127131
}
128132
}
129133
}
130-
repositories{
131-
maven{
134+
repositories {
135+
maven {
132136
def releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
133137
def snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
134138
credentials.username(System.getenv("OSS_USERNAME"))
@@ -149,7 +153,6 @@ test {
149153
maxHeapSize = "1024m"
150154
}
151155

152-
sourceCompatibility = 1.8
153156
// credit: http://stackoverflow.com/a/22681854/305340
154157
tasks.withType(JavaCompile) {
155158
options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Mon Apr 05 14:22:26 EDT 2021
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
33
distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists

sample/Archiving/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ repositories {
66
}
77

88
dependencies {
9-
compile project(':')
10-
compile group: 'com.github.codingricky', name: 'spark-core-16', version: '1.1'
11-
compile group: 'org.freemarker', name: 'freemarker', version: '2.3.19'
12-
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.6'
9+
implementation project(':')
10+
implementation 'com.github.codingricky:spark-core-16:1.1'
11+
implementation 'org.freemarker:freemarker:2.3.19'
12+
implementation 'org.slf4j:slf4j-simple:1.7.6'
1313
}
1414

1515
run.systemProperty 'API_KEY', ''

sample/HelloWorld/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
apply plugin:'application'
1+
apply plugin: 'application'
22
mainClassName = "com.example.HelloWorldServer"
33

44
repositories {
55
mavenCentral()
66
}
77

88
dependencies {
9-
compile project(':')
10-
compile group: 'com.github.codingricky', name: 'spark-core-16', version: '1.1'
11-
compile group: 'org.freemarker', name: 'freemarker', version: '2.3.19'
12-
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.6'
9+
implementation project(':')
10+
implementation 'com.github.codingricky:spark-core-16:1.1'
11+
implementation 'org.freemarker:freemarker:2.3.19'
12+
implementation 'org.slf4j:slf4j-simple:1.7.6'
1313
}
1414

1515
run.systemProperty 'API_KEY', ''

0 commit comments

Comments
 (0)