Skip to content

Commit cd9e170

Browse files
authored
Merge pull request #53 from rootlyhq/dependabot/gradle/master/gradle-wrapper-9.6.1
Bump gradle-wrapper from 8.7 to 9.6.1
2 parents bfd879a + e44c920 commit cd9e170

6 files changed

Lines changed: 179 additions & 188 deletions

File tree

build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ if(hasProperty('target') && target == 'android') {
8383
apply plugin: 'java'
8484
apply plugin: 'maven-publish'
8585

86-
sourceCompatibility = JavaVersion.VERSION_1_8
87-
targetCompatibility = JavaVersion.VERSION_1_8
86+
java {
87+
sourceCompatibility = JavaVersion.VERSION_17
88+
targetCompatibility = JavaVersion.VERSION_17
89+
}
8890

8991
publishing {
9092
publications {
@@ -96,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
9698
}
9799

98100
task execute(type:JavaExec) {
99-
main = System.getProperty('mainClass')
101+
mainClass.set(System.getProperty('mainClass'))
100102
classpath = sourceSets.main.runtimeClasspath
101103
}
102104
}
@@ -146,7 +148,7 @@ spotless {
146148
// don't need to set target, it is inferred from java
147149

148150
// apply a specific flavor of google-java-format
149-
googleJavaFormat('1.8').aosp().reflowLongStrings()
151+
googleJavaFormat('1.22.0').aosp().reflowLongStrings()
150152

151153
removeUnusedImports()
152154
importOrder()

gradle/wrapper/gradle-wrapper.jar

4.89 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 89 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)