Skip to content

Commit 1a64f20

Browse files
authored
Merge pull request #279 from cadence-workflow/java-21
upgrade gradle version so it's compatible with latest Java version. Format some files
2 parents 2b68017 + 2d3c59e commit 1a64f20

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ target
77
.gradle
88
/build
99
/out
10+
.vscode

build.gradle

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
plugins {
2-
id 'net.minecrell.licenser' version '0.4.1'
2+
id 'com.github.hierynomus.license' version '0.16.1'
33
id "com.github.sherter.google-java-format" version "0.9"
4-
id "net.ltgt.errorprone" version "1.3.0"
4+
id "net.ltgt.errorprone" version "3.1.0"
55
id 'org.springframework.boot' version '2.7.15'
6-
76
}
87

98
apply plugin: 'java'
10-
apply plugin: 'maven'
9+
apply plugin: 'maven-publish'
1110
apply plugin: 'com.github.sherter.google-java-format'
1211
apply plugin: 'io.spring.dependency-management'
1312

@@ -37,18 +36,17 @@ repositories {
3736
}
3837

3938
dependencies {
40-
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
41-
errorprone("com.google.errorprone:error_prone_core:2.4.0")
42-
compile group: 'com.uber.cadence', name: 'cadence-client', version: '3.7.2'
43-
compile group: 'commons-configuration', name: 'commons-configuration', version: '1.9'
44-
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
45-
compile group: 'com.uber.m3', name: 'tally-core', version: '0.10.0'
46-
compile group: 'com.uber.m3', name: 'tally-prometheus', version: '0.10.0'
47-
compile group: 'io.prometheus', name: 'simpleclient', version: '0.10.0'
48-
compile group: 'io.prometheus', name: 'simpleclient_httpserver', version: '0.10.0'
49-
testCompile group: 'junit', name: 'junit', version: '4.12'
50-
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
51-
testCompile group: 'org.powermock', name: 'powermock-api-mockito', version: '1.7.3'
39+
errorprone("com.google.errorprone:error_prone_core:2.23.0")
40+
implementation group: 'com.uber.cadence', name: 'cadence-client', version: '3.7.2'
41+
implementation group: 'commons-configuration', name: 'commons-configuration', version: '1.9'
42+
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
43+
implementation group: 'com.uber.m3', name: 'tally-core', version: '0.10.0'
44+
implementation group: 'com.uber.m3', name: 'tally-prometheus', version: '0.10.0'
45+
implementation group: 'io.prometheus', name: 'simpleclient', version: '0.10.0'
46+
implementation group: 'io.prometheus', name: 'simpleclient_httpserver', version: '0.10.0'
47+
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
48+
testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
49+
testImplementation group: 'org.powermock', name: 'powermock-api-mockito', version: '1.7.4'
5250
implementation 'org.springframework.boot:spring-boot-starter-web'
5351
}
5452

@@ -67,4 +65,5 @@ task execute(type: JavaExec) {
6765

6866
license {
6967
header rootProject.file('license-header.txt')
68+
include "**/*.java"
7069
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)