use conventions plugin that does not require version catalog

C-Otto · Feb 4, 2023 · aaf4dad · aaf4dad
1 parent 221bb36
commit aaf4dad
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 17 deletions.
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -9,9 +9,9 @@ application {
 
 dependencies {
     implementation(project(":subproject-two"))
-    implementation(libs.slf4jApi)
+    implementation("org.slf4j:slf4j-api")
     runtimeOnly("ch.qos.logback:logback-classic")
-    integrationTestImplementation(libs.testing.slf4jTest)
+    integrationTestImplementation("com.github.valfirst:slf4j-test")
     configurations.named("integrationTestRuntimeOnly") {
         exclude(group = "ch.qos.logback", module = "logback-classic")
         exclude(group = "org.slf4j", module = "slf4j-nop")

diff --git a/architecture-tests/build.gradle.kts b/architecture-tests/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    testImplementation(libs.testing.archunit)
+    testImplementation("com.tngtech.archunit:archunit")
 }
 
 val exposedTestClasses: Configuration by configurations.creating {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -7,7 +7,7 @@ repositories {
     mavenCentral()
 }
 
-val conventionsVersion = "2023.01.30"
+val conventionsVersion = "2023.02.04"
 
 dependencies {
     implementation("de.c-otto:java-conventions:$conventionsVersion")

diff --git a/buildSrc/src/main/kotlin/de.c-otto.playground.architecture-tests.gradle.kts b/buildSrc/src/main/kotlin/de.c-otto.playground.architecture-tests.gradle.kts
@@ -1,9 +1,7 @@
 plugins {
-    java
+    id("de.c-otto.java-conventions")
 }
 
-// https://github.com/gradle/gradle/issues/22468
-apply(plugin = "de.c-otto.java-conventions")
 
 val sharedTestClasses: Configuration by configurations.creating {
     isCanBeConsumed = false

diff --git a/buildSrc/src/main/kotlin/de.c-otto.playground.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/de.c-otto.playground.java-conventions.gradle.kts
@@ -1,11 +1,8 @@
 plugins {
-    java
+    id("de.c-otto.java-conventions")
     id("de.c-otto.playground.architecture-tests")
 }
 
-// https://github.com/gradle/gradle/issues/22468
-apply(plugin = "de.c-otto.java-conventions")
-
 group = "de.c-otto.playground"
 
 tasks.named("check") {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,9 +9,4 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
     }
-    versionCatalogs {
-        create("libs") {
-            from("de.c-otto:version-catalog:2023.01.29")
-        }
-    }
-}
+}