Declarativize remaining subprojects, do some cleanup

gradle · Feb 21, 2025 · 24fea38 · 24fea38
1 parent 349e641
commit 24fea38
Show file tree

Hide file tree

Showing 32 changed files with 22 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -116,14 +116,16 @@ Building release distributables will fail if the required JDK tools are not avai
 
 ```shell
 # Run from sources
-./gradlew :gradle-client:run
+./gradlew :gradle-client:jvmRun
 
 # Run from sources in continuous mode
-./gradlew -t :gradle-client:run
+./gradlew -t :gradle-client:jmvRun
 
+# TODO: Not working?
 # Run debug build type from build installation
 ./gradlew :gradle-client:runDistributable
 
+# TODO: Not working?
 # Run release build type from build installation
 ./gradlew :gradle-client:runReleaseDistributable
 ```

diff --git a/build-action/build.gradle.dcl b/build-action/build.gradle.dcl
@@ -0,0 +1,9 @@
+javaLibrary {
+    javaVersion = 8
+
+    dependencies {
+        // TODO: Update these to current versions
+        implementation("org.gradle:gradle-tooling-api:8.12-20241009055624+0000")
+        implementation("org.gradle:gradle-declarative-dsl-tooling-models:8.12-20241009055624+0000")
+    }
+}
diff --git a/build-action/build.gradle.kts b/build-action/build.gradle.kts
diff --git a/declarative/gradle/libs.versions.toml → declarative-logic/gradle/libs.versions.toml b/declarative/gradle/libs.versions.toml → declarative-logic/gradle/libs.versions.toml
diff --git a/declarative/plugins/build.gradle.kts → declarative-logic/plugins/build.gradle.kts b/declarative/plugins/build.gradle.kts → declarative-logic/plugins/build.gradle.kts
diff --git a/...ient/ecosystem/CustomEcosystemPlugin.java → ...ient/ecosystem/CustomEcosystemPlugin.java b/...ient/ecosystem/CustomEcosystemPlugin.java → ...ient/ecosystem/CustomEcosystemPlugin.java
diff --git a/...gradle/client/ecosystem/package-info.java → ...gradle/client/ecosystem/package-info.java b/...gradle/client/ecosystem/package-info.java → ...gradle/client/ecosystem/package-info.java
diff --git a/...type/CustomDesktopComposeApplication.java → ...type/CustomDesktopComposeApplication.java b/...type/CustomDesktopComposeApplication.java → ...type/CustomDesktopComposeApplication.java
diff --git a/...ustomDesktopComposeApplicationPlugin.java → ...ustomDesktopComposeApplicationPlugin.java b/...ustomDesktopComposeApplicationPlugin.java → ...ustomDesktopComposeApplicationPlugin.java
diff --git a/...lient/softwaretype/compose/BuildType.java → ...lient/softwaretype/compose/BuildType.java b/...lient/softwaretype/compose/BuildType.java → ...lient/softwaretype/compose/BuildType.java
diff --git a/...ient/softwaretype/compose/BuildTypes.java → ...ient/softwaretype/compose/BuildTypes.java b/...ient/softwaretype/compose/BuildTypes.java → ...ient/softwaretype/compose/BuildTypes.java
diff --git a/.../client/softwaretype/compose/Compose.java → .../client/softwaretype/compose/Compose.java b/.../client/softwaretype/compose/Compose.java → .../client/softwaretype/compose/Compose.java
diff --git a/.../softwaretype/compose/ComposeSupport.java → .../softwaretype/compose/ComposeSupport.java b/.../softwaretype/compose/ComposeSupport.java → .../softwaretype/compose/ComposeSupport.java
diff --git a/...e/client/softwaretype/compose/JvmArg.java → ...e/client/softwaretype/compose/JvmArg.java b/...e/client/softwaretype/compose/JvmArg.java → ...e/client/softwaretype/compose/JvmArg.java
diff --git a/...le/client/softwaretype/compose/Linux.java → ...le/client/softwaretype/compose/Linux.java b/...le/client/softwaretype/compose/Linux.java → ...le/client/softwaretype/compose/Linux.java
diff --git a/...le/client/softwaretype/compose/MacOS.java → ...le/client/softwaretype/compose/MacOS.java b/...le/client/softwaretype/compose/MacOS.java → ...le/client/softwaretype/compose/MacOS.java
diff --git a/...e/client/softwaretype/compose/Module.java → ...e/client/softwaretype/compose/Module.java b/...e/client/softwaretype/compose/Module.java → ...e/client/softwaretype/compose/Module.java
diff --git a/...waretype/compose/NativeDistributions.java → ...waretype/compose/NativeDistributions.java b/...waretype/compose/NativeDistributions.java → ...waretype/compose/NativeDistributions.java
diff --git a/...client/softwaretype/compose/Proguard.java → ...client/softwaretype/compose/Proguard.java b/...client/softwaretype/compose/Proguard.java → ...client/softwaretype/compose/Proguard.java
diff --git a/.../client/softwaretype/compose/Windows.java → .../client/softwaretype/compose/Windows.java b/.../client/softwaretype/compose/Windows.java → .../client/softwaretype/compose/Windows.java
diff --git a/...le/client/softwaretype/detekt/Detekt.java → ...le/client/softwaretype/detekt/Detekt.java b/...le/client/softwaretype/detekt/Detekt.java → ...le/client/softwaretype/detekt/Detekt.java
diff --git a/...nt/softwaretype/detekt/DetektSupport.java → ...nt/softwaretype/detekt/DetektSupport.java b/...nt/softwaretype/detekt/DetektSupport.java → ...nt/softwaretype/detekt/DetektSupport.java
diff --git a/...dle/client/softwaretype/package-info.java → ...dle/client/softwaretype/package-info.java b/...dle/client/softwaretype/package-info.java → ...dle/client/softwaretype/package-info.java
diff --git a/...ent/softwaretype/sqldelight/Database.java → ...ent/softwaretype/sqldelight/Database.java b/...ent/softwaretype/sqldelight/Database.java → ...ent/softwaretype/sqldelight/Database.java
diff --git a/...t/softwaretype/sqldelight/SqlDelight.java → ...t/softwaretype/sqldelight/SqlDelight.java b/...t/softwaretype/sqldelight/SqlDelight.java → ...t/softwaretype/sqldelight/SqlDelight.java
diff --git a/...aretype/sqldelight/SqlDelightSupport.java → ...aretype/sqldelight/SqlDelightSupport.java b/...aretype/sqldelight/SqlDelightSupport.java → ...aretype/sqldelight/SqlDelightSupport.java
diff --git a/declarative/settings.gradle.dcl → declarative-logic/settings.gradle.dcl b/declarative/settings.gradle.dcl → declarative-logic/settings.gradle.dcl
diff --git a/gradle-client/build.gradle.dcl b/gradle-client/build.gradle.dcl
@@ -40,6 +40,7 @@ desktopComposeApp {
                     implementation("org.slf4j:slf4j-api:2.0.14")
                     implementation("ch.qos.logback:logback-classic:1.5.6")
 
+                    // TODO: Update these to current versions
                     implementation("org.gradle:gradle-declarative-dsl-core:8.12-20241009055624+0000")
                     implementation("org.gradle:gradle-declarative-dsl-evaluator:8.12-20241009055624+0000")
                     implementation("org.gradle:gradle-declarative-dsl-tooling-models:8.12-20241009055624+0000")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/mutations-demo/build.gradle.dcl b/mutations-demo/build.gradle.dcl
@@ -0,0 +1,6 @@
+kotlinJvmLibrary {
+    dependencies {
+        // TODO: Update this to current version
+        implementation("org.gradle:gradle-declarative-dsl-core:8.12-20241009055624+0000")
+    }
+}
diff --git a/mutations-demo/build.gradle.kts b/mutations-demo/build.gradle.kts
diff --git a/settings.gradle.dcl b/settings.gradle.dcl
@@ -1,5 +1,5 @@
 pluginManagement {
-    includeBuild("./declarative")
+    includeBuild("./declarative-logic")
 
     // Check out this project as a sibling to now-in-android, that contains the declarative prototype project to use this
     // includeBuild("../now-in-android/declarative-gradle/unified-prototype/unified-plugin")
@@ -23,6 +23,7 @@ plugins {
     id("io.github.gradle.gradle-enterprise-conventions-plugin").version("0.9.1")
     id("org.gradle.toolchains.foojay-resolver-convention").version("0.8.0")
 
+    id("org.gradle.experimental.jvm-ecosystem").version("0.1.38")
     id("org.gradle.experimental.kmp-ecosystem").version("0.1.38")
     id("org.gradle.client.ecosystem.custom-ecosystem")
 }