diff --git a/oss-licenses-plugin/build.gradle.kts b/oss-licenses-plugin/build.gradle.kts index fa59f5e..10046d8 100644 --- a/oss-licenses-plugin/build.gradle.kts +++ b/oss-licenses-plugin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("groovy") id("java-gradle-plugin") - id("org.jetbrains.kotlin.jvm") version "2.2.0" + id("org.jetbrains.kotlin.jvm") version "2.2.10" id("com.gradle.plugin-publish") version "1.1.0" } diff --git a/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.jar b/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.jar index 1b33c55..8bdaf60 100644 Binary files a/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.jar and b/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.properties b/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.properties index 2a84e18..2e11132 100644 --- a/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/oss-licenses-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/oss-licenses-plugin/gradlew b/oss-licenses-plugin/gradlew index 23d15a9..adff685 100755 --- a/oss-licenses-plugin/gradlew +++ b/oss-licenses-plugin/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/oss-licenses-plugin/gradlew.bat b/oss-licenses-plugin/gradlew.bat index 5eed7ee..e509b2d 100644 --- a/oss-licenses-plugin/gradlew.bat +++ b/oss-licenses-plugin/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt b/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt index 0b4f29b..d785f68 100644 --- a/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt +++ b/oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/EndToEndTest.kt @@ -22,7 +22,7 @@ class EndToEndTest(private val agpVersion: String, private val gradleVersion: St arrayOf("8.2.0", "8.2"), arrayOf("8.10.0", "8.11.1"), arrayOf("8.12.2", "8.14"), - arrayOf("9.0.0-alpha03", "9.0.0"), + arrayOf("9.0.0", "9.1.0"), ) } @@ -292,7 +292,7 @@ private fun expectedDependenciesJson(builtInKotlinEnabled: Boolean) = """[ { "group": "org.jetbrains.kotlin", "name": "kotlin-stdlib", - "version": "2.2.0"""" else ""} + "version": "2.2.10"""" else ""} } ]"""