Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oss-licenses-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Running with the AGP 9.0.0 plugin, the 2.2.10 version is getting pulled in automatically, so to keep the tests with all version matching this seems the easiest solution.

id("com.gradle.plugin-publish") version "1.1.0"
}

Expand Down
Binary file modified oss-licenses-plugin/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions oss-licenses-plugin/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions oss-licenses-plugin/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that AGP 9.0.0 itself has shipped, not much point testing against 9.0.0-alpha03

arrayOf("9.0.0", "9.1.0"),
)
}

Expand Down Expand Up @@ -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 ""}
}
]"""

Expand Down