From 24fea38ba323645a74e4e9e839d83531970f368f Mon Sep 17 00:00:00 2001 From: Tom Tresansky Date: Fri, 21 Feb 2025 16:50:36 -0500 Subject: [PATCH] Declarativize remaining subprojects, do some cleanup --- README.md | 6 ++- build-action/build.gradle.dcl | 9 +++++ build-action/build.gradle.kts | 14 ------- .../gradle/libs.versions.toml | 0 .../plugins/build.gradle.kts | 0 .../ecosystem/CustomEcosystemPlugin.java | 0 .../gradle/client/ecosystem/package-info.java | 0 .../CustomDesktopComposeApplication.java | 0 ...CustomDesktopComposeApplicationPlugin.java | 0 .../softwaretype/compose/BuildType.java | 0 .../softwaretype/compose/BuildTypes.java | 0 .../client/softwaretype/compose/Compose.java | 0 .../softwaretype/compose/ComposeSupport.java | 0 .../client/softwaretype/compose/JvmArg.java | 0 .../client/softwaretype/compose/Linux.java | 0 .../client/softwaretype/compose/MacOS.java | 0 .../client/softwaretype/compose/Module.java | 0 .../compose/NativeDistributions.java | 0 .../client/softwaretype/compose/Proguard.java | 0 .../client/softwaretype/compose/Windows.java | 0 .../client/softwaretype/detekt/Detekt.java | 0 .../softwaretype/detekt/DetektSupport.java | 0 .../client/softwaretype/package-info.java | 0 .../softwaretype/sqldelight/Database.java | 0 .../softwaretype/sqldelight/SqlDelight.java | 0 .../sqldelight/SqlDelightSupport.java | 0 .../settings.gradle.dcl | 0 gradle-client/build.gradle.dcl | 1 + gradle/libs.versions.toml | 38 ------------------- mutations-demo/build.gradle.dcl | 6 +++ mutations-demo/build.gradle.kts | 7 ---- settings.gradle.dcl | 3 +- 32 files changed, 22 insertions(+), 62 deletions(-) create mode 100644 build-action/build.gradle.dcl delete mode 100644 build-action/build.gradle.kts rename {declarative => declarative-logic}/gradle/libs.versions.toml (100%) rename {declarative => declarative-logic}/plugins/build.gradle.kts (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/ecosystem/CustomEcosystemPlugin.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/ecosystem/package-info.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplication.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplicationPlugin.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildType.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildTypes.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/Compose.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/ComposeSupport.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/JvmArg.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/Linux.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/MacOS.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/Module.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/NativeDistributions.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/Proguard.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/compose/Windows.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/detekt/Detekt.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/detekt/DetektSupport.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/package-info.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/Database.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelight.java (100%) rename {declarative => declarative-logic}/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelightSupport.java (100%) rename {declarative => declarative-logic}/settings.gradle.dcl (100%) delete mode 100644 gradle/libs.versions.toml create mode 100644 mutations-demo/build.gradle.dcl delete mode 100644 mutations-demo/build.gradle.kts diff --git a/README.md b/README.md index 1b35906..ece6238 100644 --- 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 new file mode 100644 index 0000000..acf4a16 --- /dev/null +++ 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 deleted file mode 100644 index a38bb91..0000000 --- a/build-action/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -plugins { - java -} - -dependencies { - implementation(libs.gradle.tooling.api) - implementation(libs.gradle.declarative.dsl.tooling.models) -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } -} \ No newline at end of file diff --git a/declarative/gradle/libs.versions.toml b/declarative-logic/gradle/libs.versions.toml similarity index 100% rename from declarative/gradle/libs.versions.toml rename to declarative-logic/gradle/libs.versions.toml diff --git a/declarative/plugins/build.gradle.kts b/declarative-logic/plugins/build.gradle.kts similarity index 100% rename from declarative/plugins/build.gradle.kts rename to declarative-logic/plugins/build.gradle.kts diff --git a/declarative/plugins/src/main/java/org/gradle/client/ecosystem/CustomEcosystemPlugin.java b/declarative-logic/plugins/src/main/java/org/gradle/client/ecosystem/CustomEcosystemPlugin.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/ecosystem/CustomEcosystemPlugin.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/ecosystem/CustomEcosystemPlugin.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/ecosystem/package-info.java b/declarative-logic/plugins/src/main/java/org/gradle/client/ecosystem/package-info.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/ecosystem/package-info.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/ecosystem/package-info.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplication.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplication.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplication.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplication.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplicationPlugin.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplicationPlugin.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplicationPlugin.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplicationPlugin.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildType.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildType.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildType.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildType.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildTypes.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildTypes.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildTypes.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildTypes.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Compose.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Compose.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Compose.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Compose.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/ComposeSupport.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/ComposeSupport.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/ComposeSupport.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/ComposeSupport.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/JvmArg.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/JvmArg.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/JvmArg.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/JvmArg.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Linux.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Linux.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Linux.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Linux.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/MacOS.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/MacOS.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/MacOS.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/MacOS.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Module.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Module.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Module.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Module.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/NativeDistributions.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/NativeDistributions.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/NativeDistributions.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/NativeDistributions.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Proguard.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Proguard.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Proguard.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Proguard.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Windows.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Windows.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Windows.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/compose/Windows.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/detekt/Detekt.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/detekt/Detekt.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/detekt/Detekt.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/detekt/Detekt.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/detekt/DetektSupport.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/detekt/DetektSupport.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/detekt/DetektSupport.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/detekt/DetektSupport.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/package-info.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/package-info.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/package-info.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/package-info.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/Database.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/Database.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/Database.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/Database.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelight.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelight.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelight.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelight.java diff --git a/declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelightSupport.java b/declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelightSupport.java similarity index 100% rename from declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelightSupport.java rename to declarative-logic/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelightSupport.java diff --git a/declarative/settings.gradle.dcl b/declarative-logic/settings.gradle.dcl similarity index 100% rename from declarative/settings.gradle.dcl rename to declarative-logic/settings.gradle.dcl diff --git a/gradle-client/build.gradle.dcl b/gradle-client/build.gradle.dcl index 1f43211..5cd36df 100644 --- 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 deleted file mode 100644 index 81bb934..0000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,38 +0,0 @@ -[versions] -kotlin = "2.0.21" -kotlinx-coroutines = "1.8.1" -kotlinx-serialization = "1.6.3" -decompose = "3.0.0" -gradle-tooling = "8.12-20241009055624+0000" -declarative-dsl = "8.12-20241009055624+0000" -ktor = "2.3.12" -junit-jupiter = "5.11.4" - -[libraries] -kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } -kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "kotlinx-coroutines" } -kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing" } -kotlinx-serialization-bom = { module = "org.jetbrains.kotlinx:kotlinx-serialization-bom", version.ref = "kotlinx-serialization" } -kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json" } -ktor-bom = { module = "io.ktor:ktor-bom", version.ref = "ktor" } -ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp" } -ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json" } -decompose-decompose = { module = "com.arkivanov.decompose:decompose", version.ref = "decompose" } -decompose-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" } -essenty-lifecycle-coroutines = { module = "com.arkivanov.essenty:lifecycle-coroutines", version = "1.3.0" } -gradle-tooling-api = { module = "org.gradle:gradle-tooling-api", version.ref = "gradle-tooling" } -gradle-declarative-dsl-core = { module = "org.gradle:gradle-declarative-dsl-core", version.ref = "declarative-dsl" } -gradle-declarative-dsl-evaluator = { module = "org.gradle:gradle-declarative-dsl-evaluator", version.ref = "declarative-dsl" } -gradle-declarative-dsl-tooling-models = { module = "org.gradle:gradle-declarative-dsl-tooling-models", version.ref = "declarative-dsl" } -material3WindowSizeClassMultiplatform = { module = "dev.chrisbanes.material3:material3-window-size-class-multiplatform", version = "0.5.0" } -materialKolor = { module = "com.materialkolor:material-kolor", version = "1.7.0" } -filekit-compose = { module = "io.github.vinceglb:filekit-compose", version = "0.8.2" } -slf4j-api = { module = "org.slf4j:slf4j-api", version = "2.0.14" } -logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.6" } -junit-junit = { module = "junit:junit", version = "4.13.2" } -junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" } - -[plugins] -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform" } -kotlinJvm = { id = "org.jetbrains.kotlin.jvm" } -kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/mutations-demo/build.gradle.dcl b/mutations-demo/build.gradle.dcl new file mode 100644 index 0000000..3a4910e --- /dev/null +++ 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 deleted file mode 100644 index 3286493..0000000 --- a/mutations-demo/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - alias(libs.plugins.kotlinJvm) -} - -dependencies { - implementation(libs.gradle.declarative.dsl.core) -} diff --git a/settings.gradle.dcl b/settings.gradle.dcl index 2eaf3f7..d20281b 100644 --- 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") }