Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle 7.6 to 8.2 (conventions to extensions migration, mostly) #3051

Merged
merged 34 commits into from
Jul 4, 2023
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5f18ae0
Fix CollectionUtils deprecation nagging by migrating from
TWiStErRob Jun 30, 2023
10ac81b
Fix warning during test by only setting the flag when applicable.
TWiStErRob Jun 30, 2023
ed8718c
Use the official method for pulling dependencies from Gradle repo.
TWiStErRob Jun 30, 2023
6b00559
AbstractArchiveTask.setClassifier(String) was deprecated and removed …
TWiStErRob Jun 30, 2023
c00a56e
Migrate from BasePluginConvention to BasePluginExtension in rootProje…
TWiStErRob Jun 30, 2023
95226dd
Migrate from BasePluginConvention to BasePluginExtension in rootProject
TWiStErRob Jun 30, 2023
672c32e
Upgrade Gradle wrapper to 8.2 RC3
TWiStErRob Jun 30, 2023
025c6b4
Migrate from JavaPluginConvention to JavaPluginExtension: sourceCompa…
TWiStErRob Jul 4, 2023
50142bd
Migrate from JavaPluginConvention to JavaPluginExtension: sourceCompa…
TWiStErRob Jul 4, 2023
1d76b7d
Migrate from JavaPluginConvention to JavaPluginExtension: sourceCompa…
TWiStErRob Jul 4, 2023
b3262fa
Migrate from JavaPluginConvention to JavaPluginExtension: sourceCompa…
TWiStErRob Jul 4, 2023
199f8e9
Migrate from JavaPluginConvention to JavaPluginExtension: sourceCompa…
TWiStErRob Jul 4, 2023
088ba37
Migrate from JavaPluginConvention to JavaPluginExtension: sourceCompa…
TWiStErRob Jul 4, 2023
86e2883
Migrate from BasePluginConvention to BasePluginExtension in :bom
TWiStErRob Jul 4, 2023
0be5302
Migrate from BasePluginConvention to BasePluginExtension in rootProje…
TWiStErRob Jul 4, 2023
24630b7
Report.destination(File) was deprecated and removed in favor of Repor…
TWiStErRob Jul 4, 2023
ae13260
Jar.classpath property doesn't exist, it's a magical property defined…
TWiStErRob Jul 4, 2023
dde6bd6
Bundle.bnd property doesn't exist, it's a magical property defined at…
TWiStErRob Jul 4, 2023
9d06229
Help future maintainer figure out what non-standard bundle { } closur…
TWiStErRob Jul 4, 2023
78fa7f1
Suppress unchecked warning, it's as safe as Groovy accessing the same.
TWiStErRob Jul 4, 2023
95eb0dd
Upgrade AGP 7.3.1 to 7.4.2 to get updates for Gradle deprecations.
TWiStErRob Jul 4, 2023
f8c83c5
Groovy needed to move groovy.util.XmlSlurper to groovy.xml, see
TWiStErRob Jul 4, 2023
6adcf6c
Migrate from BasePluginConvention to BasePluginExtension in java-library
TWiStErRob Jul 4, 2023
e1e2656
Migrate from BasePluginExtension.getArchivesBaseName(): String to Bas…
TWiStErRob Jul 4, 2023
886d391
WriteProperties.setOutputFile(File) was deprecated in Gradle 8.1 in f…
TWiStErRob Jul 4, 2023
35d3bfb
Syntax cleanup: ProjectLayout.getBuildDirectory is a property, access…
TWiStErRob Jul 4, 2023
c6d05b5
Migrate from JavaPluginConvention to JavaPluginExtension: targetCompa…
TWiStErRob Jul 4, 2023
941bbfd
Bump Gradle Enterprise plugin to latest to remove deprecated usage:
TWiStErRob Jul 4, 2023
badc994
Bump Gradle 8.2 to stable
TWiStErRob Jul 4, 2023
433668e
Add implicit test dependency to fix Gradle classpath.
TWiStErRob Jul 4, 2023
bd4318d
Suppress known and accepted license header problems:
TWiStErRob Jul 4, 2023
de0e384
Downgrade to Gradle 8.1 to prevent triggering https://github.com/bndt…
TWiStErRob Jul 4, 2023
e1fec73
Remove outdated hack, it seems to do nothing (verified with `gradlew …
TWiStErRob Jul 4, 2023
0a56409
Revert "Downgrade to Gradle 8.1 to prevent triggering https://github.…
TWiStErRob Jul 4, 2023
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
Next Next commit
Fix CollectionUtils deprecation nagging by migrating from
`org.gradle.util.CollectionUtils.join(java.lang.String, java.lang.Object[])`
to
`org.codehaus.groovy.runtime.DefaultGroovyMethods.join(T[], java.lang.String)`

Original method was non-trivial from looking at Groovy code, by default everything in basic `org.gradle`, `org.gradle.utils` and other packages are visible, and there was a `CollectionUtils` in `org.gradle.utils`.

> Task :osgi-test:test
The org.gradle.util.CollectionUtils type has been deprecated. This is scheduled to be removed in Gradle 9.0. Consult the upgrading guide for further information: https://docs.gradle.org/7.6/userguide/upgrading_version_7.html#org_gradle_util_reports_deprecations
        at RuntimeBundlesProvider.asArguments(subprojects\osgi-test\osgi-test.gradle:58)
  • Loading branch information
TWiStErRob committed Jul 4, 2023
commit 5f18ae0113b2a4823b9e1fc9cf155199b68eaa15
2 changes: 1 addition & 1 deletion subprojects/osgi-test/osgi-test.gradle
Original file line number Diff line number Diff line change
@@ -55,6 +55,6 @@ class RuntimeBundlesProvider implements CommandLineArgumentProvider {
@Override
Iterable<String> asArguments() {
String[] absolutePaths = files.stream().map {it.absolutePath}.toArray()
["-DtestRuntimeBundles=${CollectionUtils.join(File.pathSeparator, absolutePaths)}".toString()]
["-DtestRuntimeBundles=${absolutePaths.join(File.pathSeparator)}".toString()]
}
}