Switch to DCL file for gradle-client project

declarative/gradle/libs.versions.toml

@@ -11,6 +11,7 @@ detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.
 jetbrains-compose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-plugin" }
 kotlin-compose = { module = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin", version.ref = "kotlin" }
 kotlin-multiplatform = { module = "org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin", version.ref = "kotlin" }
+kotlin-serialization = { module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kotlin" }
 sqldelight = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
 sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqldelight" }
 sqldelight-extensions-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
@@ -22,3 +23,5 @@ jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-plugi
 kmp-ecosystem = { id = "org.gradle.experimental.kmp-ecosystem", version.ref = "declarative" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
+kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+

declarative/plugins/build.gradle.kts

@@ -1,3 +1,4 @@
+// TODO: This file must unfortunately remain non-DCL, until we can create a new plugin project ecosystem type in the prototype
 plugins {
     id("java-gradle-plugin")
 }
@@ -6,11 +7,12 @@ description = "Declarative plugins containing custom software types for the grad
 
 dependencies {
     api(libs.declarative)
-    api(libs.detekt)
-    api(libs.jetbrains.compose)
-    api(libs.kotlin.compose)
     api(libs.kotlin.multiplatform)
+    api(libs.kotlin.serialization)
+    api(libs.kotlin.compose)
+    api(libs.jetbrains.compose)
     api(libs.sqldelight)
+    api(libs.detekt)
 }
 
 gradlePlugin {

declarative/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplication.java

@@ -10,7 +10,6 @@
 import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface CustomDesktopComposeApplication {
     @Restricted
     Property<String> getGroup();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/CustomDesktopComposeApplicationPlugin.java

@@ -25,6 +25,8 @@ public void apply(Project project) {
         project.setVersion(dslModel.getVersion());
 
         wireKMPApplication(project, dslModel.getKotlinApplication());
+        project.getPlugins().apply("org.jetbrains.kotlin.plugin.serialization");
+
         wireDetekt(project, dslModel.getDetekt());
 
         /*

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildType.java

@@ -5,7 +5,6 @@
 import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface BuildType {
     @Nested
     Proguard getProguard();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/BuildTypes.java

@@ -5,7 +5,6 @@
 import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface BuildTypes {
     @Nested
     BuildType getRelease();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Compose.java

@@ -7,7 +7,6 @@
 import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface Compose {
     @Restricted
     Property<String> getMainClass();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/ComposeSupport.java

@@ -2,11 +2,11 @@
 
 import kotlin.Unit;
 import org.gradle.api.Project;
-import org.gradle.api.provider.Property;
 import org.gradle.client.softwaretype.CustomDesktopComposeApplication;
 import org.jetbrains.compose.ComposeExtension;
 import org.jetbrains.compose.desktop.DesktopExtension;
 import org.jetbrains.compose.desktop.application.dsl.*;
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat;
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension;
 
 import java.io.IOException;
@@ -61,7 +61,7 @@ private static void wireBuildType(BuildType buildTypeModel, JvmApplicationBuildT
     }
 
     private static void wireNativeDistribution(NativeDistributions nativeDistributionsModel, JvmApplicationDistributions nativeDistributions) {
-        nativeDistributions.setTargetFormats(EnumSet.copyOf(nativeDistributionsModel.getTargetFormats().stream().map(TargetFormat::getValue).map(Property::get).collect(Collectors.toList())));
+        nativeDistributions.setTargetFormats(EnumSet.copyOf(nativeDistributionsModel.getTargetFormats().get().stream().map(TargetFormat::valueOf).collect(Collectors.toList())));
 
         nativeDistributions.setPackageName(nativeDistributionsModel.getPackageName().get());
         nativeDistributions.setPackageVersion(nativeDistributionsModel.getPackageVersion().get());

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/JvmArg.java

@@ -4,7 +4,6 @@
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface JvmArg extends Named {
     @Restricted
     Property<String> getValue();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Linux.java

@@ -3,7 +3,6 @@
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface Linux {
     @Restricted
     RegularFileProperty getIconFile();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/MacOS.java

@@ -4,7 +4,6 @@
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface MacOS {
     @Restricted
     RegularFileProperty getIconFile();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Module.java

@@ -4,7 +4,6 @@
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface Module extends Named {
     @Restricted
     Property<String> getValue();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/NativeDistributions.java

@@ -3,16 +3,15 @@
 import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Nested;
 import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-import java.time.Year;
-
-@Restricted
 public interface NativeDistributions {
-    NamedDomainObjectContainer<TargetFormat> getTargetFormats();
+    @Restricted
+    ListProperty<String> getTargetFormats();
 
     @Restricted
     Property<String> getPackageName();
@@ -27,7 +26,7 @@ public interface NativeDistributions {
     Property<String> getVendor();
 
     @Restricted
-    Property<Year> getCopyrightYear();
+    Property<String> getCopyrightYear();
 
     @Restricted
     DirectoryProperty getAppResourcesRootDir();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Proguard.java

@@ -1,16 +1,17 @@
 package org.gradle.client.softwaretype.compose;
 
-import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface Proguard {
     @Restricted
     Property<Boolean> getOptimize();
 
     @Restricted
     Property<Boolean> getObfuscate();
 
-    ConfigurableFileCollection getConfigurationFiles();
+    @Restricted
+    ListProperty<RegularFile> getConfigurationFiles();
 }

declarative/plugins/src/main/java/org/gradle/client/softwaretype/compose/Windows.java

@@ -4,7 +4,6 @@
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface Windows {
     @Restricted
     RegularFileProperty getIconFile();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/detekt/Detekt.java

@@ -1,16 +1,17 @@
 package org.gradle.client.softwaretype.detekt;
 
-import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.Directory;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface Detekt {
     @Restricted
-    ConfigurableFileCollection getSource();
+    ListProperty<Directory> getSource();
 
     @Restricted
-    ConfigurableFileCollection getConfig();
+    ListProperty<RegularFile> getConfig();
 
     @Restricted
     Property<Boolean> getParallel();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/detekt/DetektSupport.java

@@ -11,6 +11,7 @@ public static void wireDetekt(Project project, Detekt dslModel) {
 
         project.afterEvaluate(p -> {
             DetektExtension detekt = project.getExtensions().findByType(DetektExtension.class);
+            assert detekt != null;
             detekt.getSource().from(dslModel.getSource());
             detekt.getConfig().from(dslModel.getConfig());
 

declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/Database.java

@@ -4,7 +4,6 @@
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface Database extends Named {
     @Restricted
     Property<String> getPackageName();

declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelight.java

@@ -3,7 +3,6 @@
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
-@Restricted
 public interface SqlDelight {
     NamedDomainObjectContainer<Database> getDatabases();
 }

declarative/plugins/src/main/java/org/gradle/client/softwaretype/sqldelight/SqlDelightSupport.java

@@ -4,14 +4,14 @@
 import org.gradle.api.Project;
 import org.gradle.client.softwaretype.CustomDesktopComposeApplication;
 
-@SuppressWarnings("UnstableApiUsage")
 public final class SqlDelightSupport {
     private SqlDelightSupport() { /* not instantiable */ }
 
     public static boolean needToWireSqlDelight(CustomDesktopComposeApplication dslModel) {
         return !dslModel.getSqlDelight().getDatabases().isEmpty();
     }
 
+    @SuppressWarnings("CodeBlock2Expr")
     public static void wireSqlDelight(Project project, CustomDesktopComposeApplication dslModel) {
         project.getPluginManager().apply("app.cash.sqldelight");
 

declarative/settings.gradle.dcl

@@ -13,9 +13,6 @@ dependencyResolutionManagement {
     }
 }
 
-// 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")
-
 rootProject.name = "declarative"
 
 include("plugins")