Skip to content

Commit

Permalink
Update Gradle, plugins and dependencies
Browse files Browse the repository at this point in the history
Keep KtLint at 0.49.1 as spotless is not yet
compatible with KtLint 0.50.0
  • Loading branch information
tbroyer committed Jun 30, 2023
1 parent d702095 commit c6531ea
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Try to keep each section sorted alphabetically (with some exceptions to group entries together)
[versions]
autoService = "1.0.1"
autoService = "1.1.1"

# Versions used by build-logic
googleJavaFormat = "1.15.0"
ktlint = "0.48.2"
googleJavaFormat = "1.17.0"
ktlint = "0.49.1"

[libraries]
autoService = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
autoService-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" }
compileTesting = "com.google.testing.compile:compile-testing:0.21.0"
junit = "junit:junit:4.13.2"
truth = "com.google.truth:truth:1.1.3"
truth = "com.google.truth:truth:1.1.5"

# Used in below bundle
errorprone-core = "com.google.errorprone:error_prone_core:2.18.0"
nullaway = "com.uber.nullaway:nullaway:0.10.8"
errorprone-core = "com.google.errorprone:error_prone_core:2.20.0"
nullaway = "com.uber.nullaway:nullaway:0.10.11"

[bundles]
# Used by build-logic
errorprone = [ "errorprone-core", "nullaway" ]

[plugins]
errorprone = "net.ltgt.errorprone:3.0.1"
nullaway = "net.ltgt.nullaway:1.5.0"
spotless = "com.diffplug.spotless:6.13.0"
errorprone = "net.ltgt.errorprone:3.1.0"
nullaway = "net.ltgt.nullaway:1.6.0"
spotless = "com.diffplug.spotless:6.19.0"
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down

0 comments on commit c6531ea

Please sign in to comment.