Update Kotlin to 1.8.10, Gradle to 8.0, and move buildSrc to included…

… builds
Vampire · Feb 16, 2023 · 2238c92 · 2238c92
1 parent c6f569d
commit 2238c92
Show file tree

Hide file tree

Showing 59 changed files with 3,112 additions and 2,834 deletions.
diff --git a/.github/workflows/check-dependency-versions.main.kts b/.github/workflows/check-dependency-versions.main.kts
@@ -59,8 +59,7 @@ workflowWithCopyright(
             action = GradleCacheActionV1(
                 arguments = listOf("dependencyUpdates"),
                 debug = false,
-                concurrent = true,
-                gradleDependenciesCacheKey = listOf("buildSrc/**/Versions.kt")
+                concurrent = true
             )
         )
     }

diff --git a/.github/workflows/check-dependency-versions.yaml b/.github/workflows/check-dependency-versions.yaml
@@ -50,7 +50,6 @@ jobs:
       name: Check Dependency Versions
       uses: burrunan/gradle-cache-action@v1
       with:
-        gradle-dependencies-cache-key: buildSrc/**/Versions.kt
         debug: false
         concurrent: true
         arguments: dependencyUpdates
diff --git a/.github/workflows/test.main.kts b/.github/workflows/test.main.kts
@@ -160,8 +160,7 @@ workflowWithCopyright(
                     "--scan"
                 ),
                 debug = false,
-                concurrent = true,
-                gradleDependenciesCacheKey = listOf("buildSrc/**/Versions.kt")
+                concurrent = true
             )
         )
         uses(

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -52,7 +52,6 @@ jobs:
       name: Build
       uses: burrunan/gradle-cache-action@v1
       with:
-        gradle-dependencies-cache-key: buildSrc/**/Versions.kt
         debug: false
         concurrent: true
         arguments: |-

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# Copyright 2020 Björn Kautler
+# Copyright 2020-2023 Björn Kautler
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 /.idea/
 /.gradle/
 /build/
-/buildSrc/.gradle/
-/buildSrc/build/
+/gradle/build-logic/.gradle/
+/gradle/build-logic/build/
+/gradle/dependency-updates-report-aggregation/.gradle/
+/gradle/dependency-updates-report-aggregation/build/
 /ncc-packer/build/
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,9 +15,9 @@
  */
 
 plugins {
-    net.kautler.versions
-    net.kautler.node
-    net.kautler.github_actions
-    net.kautler.readme
-    net.kautler.publishing
+    id(libs.plugins.convention.versions.get().pluginId)
+    id(libs.plugins.convention.node.get().pluginId)
+    id(libs.plugins.convention.github.actions.get().pluginId)
+    id(libs.plugins.convention.readme.get().pluginId)
+    id(libs.plugins.convention.publishing.get().pluginId)
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/src/main/kotlin/net/kautler/Versions.kt b/buildSrc/src/main/kotlin/net/kautler/Versions.kt