Bump dependencies (Kotlin, gradle-enterprise, assertj-core) (#444)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
usefulness · Jan 7, 2023 · b455a61 · b455a61
1 parent 1bb1b97
commit b455a61
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -81,7 +81,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: [ '7.4', current, release-candidate ]
+        gradle: [ '7.6', current, release-candidate ]
         task: [ build, projectTest, projectLint, projectCodeStyle, projectCoverage, issueLinksReport ]
     name: (Android) Gradle version ${{ matrix.gradle }}, task ${{ matrix.task }}
     steps:
@@ -107,7 +107,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: [ '7.4', current, release-candidate ]
+        gradle: [ '7.6', current, release-candidate ]
         task: [ build, projectTest, projectCodeStyle, projectCoverage, issueLinksReport ]
     name: (Kotlin) Gradle ${{ matrix.gradle }}, task ${{ matrix.task }}
     steps:

diff --git a/build.gradle b/build.gradle
@@ -22,6 +22,9 @@ allprojects {
                 }
             }
         }
+        kotlin {
+            jvmToolchain(17)
+        }
     }
     tasks.withType(Test).configureEach {
         doLast {
@@ -30,12 +33,6 @@ allprojects {
     }
 
     pluginManager.withPlugin("java") {
-        java {
-            toolchain {
-                languageVersion = JavaLanguageVersion.of(JavaVersion.VERSION_17.toString())
-            }
-        }
-
         if (project.hasProperty("skipJarVersion")) {
             tasks.named("jar") {
                 archiveFile.set(new File(project.buildDir, "libs/${project.name}.jar"))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,11 +4,11 @@ gradle-kotlinter = "3.13.0"
 gradle-gradlepublish = "1.1.0"
 google-agp = "7.3.1"
 gradle-jacocotestkit = "1.0.9"
-maven-kotlin = "1.7.22"
+maven-kotlin = "1.8.0"
 maven-issuechecker = "0.3.0"
 gradle-detekt = "1.22.0"
 maven-junit = "5.9.1"
-maven-assertj = "3.23.1"
+maven-assertj = "3.24.1"
 maven-jgit = "6.4.0.202211300538-r"
 gradle-axion = "1.14.3"
 

diff --git a/gradle/plugins/build.gradle b/gradle/plugins/build.gradle
@@ -9,10 +9,8 @@ dependencies {
     implementation libs.publishplugin.gradle
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion))
-    }
+kotlin {
+    jvmToolchain(17)
 }
 
 gradlePlugin {

diff --git a/gradle/plugins/src/main/kotlin/PublishingPlugin.kt b/gradle/plugins/src/main/kotlin/PublishingPlugin.kt
@@ -4,12 +4,13 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionContainer
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.plugin.devel.GradlePluginDevelopmentExtension
 import org.gradle.plugins.signing.SigningExtension
 
 class PublishingPlugin : Plugin<Project> {
 
     override fun apply(target: Project) = with(target) {
+        if (gradle.parent != null) return
         pluginManager.apply("maven-publish")
         pluginManager.apply("com.gradle.plugin-publish")
         pluginManager.apply("signing")
@@ -43,11 +44,13 @@ class PublishingPlugin : Plugin<Project> {
             }
         }
 
-        extensions.configure<PluginBundleExtension> {
-            website = "https://github.com/usefulness/project-starter/"
-            vcsUrl = "https://github.com/usefulness/project-starter.git"
-            description = "Set of plugins that might be useful for Multi-Module Android projects."
-            tags = listOf("android", "kotlin", "quickstart", "codestyle", "library", "baseline")
+        extensions.configure<GradlePluginDevelopmentExtension> {
+            website.set("https://github.com/usefulness/project-starter/")
+            vcsUrl.set("https://github.com/usefulness/project-starter.git")
+            plugins.configureEach { plugin ->
+                plugin.tags.set(listOf("android", "kotlin", "quickstart", "codestyle", "library", "baseline"))
+                plugin.description = "Set of plugins that might be useful for Multi-Module Android projects."
+            }
         }
     }
 

diff --git a/settings.gradle b/settings.gradle
@@ -8,8 +8,10 @@ pluginManagement {
 }
 
 plugins {
-    id "com.gradle.enterprise" version "3.12.1"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+    id "com.gradle.enterprise" version "3.12.2"
 }
+
 includeBuild("gradle/plugins")
 
 dependencyResolutionManagement {