chore: update to fix config cache stuff

utybo · Nov 16, 2024 · 37a72ca · 37a72ca
1 parent 26ca9c9
commit 37a72ca
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 43 deletions.
diff --git a/buildSrc/src/main/kotlin/tegral.base-conventions.gradle.kts b/buildSrc/src/main/kotlin/tegral.base-conventions.gradle.kts
@@ -2,7 +2,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
     id("com.github.ben-manes.versions")
-    id("org.cadixdev.licenser")
+    id("dev.yumi.gradle.licenser")
 }
 
 version = rootProject.version
@@ -26,5 +26,5 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
 }
 
 license {
-    setHeader(rootProject.file("LICENSE_HEADER"))
+    rule(rootProject.file("LICENSE_HEADER"))
 }
diff --git a/buildSrc/src/main/kotlin/tegral.kotlin-common-conventions.gradle.kts b/buildSrc/src/main/kotlin/tegral.kotlin-common-conventions.gradle.kts
@@ -43,5 +43,6 @@ testing {
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(11)
+        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
diff --git a/e2e-tests/run-with-java-11/build.gradle.kts b/e2e-tests/run-with-java-11/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(11)
+        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
 
diff --git a/e2e-tests/run-with-java-17/build.gradle.kts b/e2e-tests/run-with-java-17/build.gradle.kts
@@ -9,5 +9,6 @@ dependencies {
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(17)
+        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockk = "1.13.13"
 nodeGradle = "7.1.0"
 slf4j = "2.0.16"
 versions = "0.51.0"
-licenserPlugin = "0.6.1"
+licenserPlugin = "2.0.0"
 swaggerCore = "2.2.25"
 swaggerUi = "5.17.14"
 clikt = "5.0.1"
@@ -111,5 +111,5 @@ versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
 gradleTestLogger = { id = "com.adarshr.test-logger", version.ref = "gradleTestLogger" }
 kotlinBcv = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinBcv" }
 nodeGradle = { id = "com.github.node-gradle.node", version.ref = "nodeGradle" }
-licenser = { id = "org.cadixdev.licenser", version.ref = "licenserPlugin" }
+licenser = { id = "dev.yumi.gradle.licenser", version.ref = "licenserPlugin" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,52 +1,53 @@
 plugins {
     id("com.gradle.enterprise") version "3.12.2"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 
 val publicProjects = listOf(
-        ":tegral-catalog",
-        ":tegral-config:tegral-config-core",
-        ":tegral-core",
-        ":tegral-di:tegral-di-core",
-        ":tegral-di:tegral-di-services",
-        ":tegral-di:tegral-di-test",
-        ":tegral-di:tegral-di-test-mockk",
-        ":tegral-featureful",
-        ":tegral-logging",
-        ":tegral-niwen:tegral-niwen-lexer",
-        ":tegral-niwen:tegral-niwen-parser",
-        ":tegral-openapi:tegral-openapi-cli",
-        ":tegral-openapi:tegral-openapi-dsl",
-        ":tegral-openapi:tegral-openapi-feature",
-        ":tegral-openapi:tegral-openapi-ktor",
-        ":tegral-openapi:tegral-openapi-ktor-resources",
-        ":tegral-openapi:tegral-openapi-ktorui",
-        ":tegral-openapi:tegral-openapi-scriptdef",
-        ":tegral-openapi:tegral-openapi-scripthost",
-        ":tegral-prismakt:tegral-prismakt-generator",
-        ":tegral-services:tegral-services-api",
-        ":tegral-services:tegral-services-feature",
-        ":tegral-utils:tegral-utils-logtools",
-        ":tegral-web:tegral-web-appdefaults",
-        ":tegral-web:tegral-web-appdsl",
-        ":tegral-web:tegral-web-apptest",
-        ":tegral-web:tegral-web-config",
-        ":tegral-web:tegral-web-controllers",
-        ":tegral-web:tegral-web-controllers-test",
-        ":tegral-web:tegral-web-greeter",
+    ":tegral-catalog",
+    ":tegral-config:tegral-config-core",
+    ":tegral-core",
+    ":tegral-di:tegral-di-core",
+    ":tegral-di:tegral-di-services",
+    ":tegral-di:tegral-di-test",
+    ":tegral-di:tegral-di-test-mockk",
+    ":tegral-featureful",
+    ":tegral-logging",
+    ":tegral-niwen:tegral-niwen-lexer",
+    ":tegral-niwen:tegral-niwen-parser",
+    ":tegral-openapi:tegral-openapi-cli",
+    ":tegral-openapi:tegral-openapi-dsl",
+    ":tegral-openapi:tegral-openapi-feature",
+    ":tegral-openapi:tegral-openapi-ktor",
+    ":tegral-openapi:tegral-openapi-ktor-resources",
+    ":tegral-openapi:tegral-openapi-ktorui",
+    ":tegral-openapi:tegral-openapi-scriptdef",
+    ":tegral-openapi:tegral-openapi-scripthost",
+    ":tegral-prismakt:tegral-prismakt-generator",
+    ":tegral-services:tegral-services-api",
+    ":tegral-services:tegral-services-feature",
+    ":tegral-utils:tegral-utils-logtools",
+    ":tegral-web:tegral-web-appdefaults",
+    ":tegral-web:tegral-web-appdsl",
+    ":tegral-web:tegral-web-apptest",
+    ":tegral-web:tegral-web-config",
+    ":tegral-web:tegral-web-controllers",
+    ":tegral-web:tegral-web-controllers-test",
+    ":tegral-web:tegral-web-greeter",
 )
 
 val testProjects = publicProjects - ":tegral-catalog" + listOf(
-        ":tegral-prismakt:tegral-prismakt-generator-tests:mysql-types",
-        ":tegral-prismakt:tegral-prismakt-generator-tests:pgsql-types",
-        ":tegral-prismakt:tegral-prismakt-generator-tests:simple-dao",
-        ":tegral-prismakt:tegral-prismakt-generator-tests:simple-sql",
-        ":tegral-prismakt:tegral-prismakt-generator-tests-support",
-        ":e2e-tests:fundef-modules",
-        ":e2e-tests:run-with-java-11",
-        ":e2e-tests:run-with-java-17",
-        ":e2e-tests:run-without-config"
+    ":tegral-prismakt:tegral-prismakt-generator-tests:mysql-types",
+    ":tegral-prismakt:tegral-prismakt-generator-tests:pgsql-types",
+    ":tegral-prismakt:tegral-prismakt-generator-tests:simple-dao",
+    ":tegral-prismakt:tegral-prismakt-generator-tests:simple-sql",
+    ":tegral-prismakt:tegral-prismakt-generator-tests-support",
+    ":e2e-tests:fundef-modules",
+    ":e2e-tests:run-with-java-11",
+    ":e2e-tests:run-with-java-17",
+    ":e2e-tests:run-without-config"
 )
 
 gradle.extra["publicProjects"] = publicProjects