Use new gradle plugin syntax.

vaginessa · May 10, 2022 · cbb618c · cbb618c
1 parent e0bf8eb
commit cbb618c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 32 deletions.
diff --git a/src/commonMain/kotlin/org/jetbrains/webwiz/generator/files/RootBuildGradle.kt b/src/commonMain/kotlin/org/jetbrains/webwiz/generator/files/RootBuildGradle.kt
@@ -1,41 +1,29 @@
 package org.jetbrains.webwiz.generator.files
 
-import org.jetbrains.webwiz.generator.NAN
 import org.jetbrains.webwiz.generator.ProjectFile
-import org.jetbrains.webwiz.generator.deleteNans
 import org.jetbrains.webwiz.models.GradlePlugin
 import org.jetbrains.webwiz.models.KmpLibrary
-import org.jetbrains.webwiz.models.KotlinVersion
 import org.jetbrains.webwiz.models.ProjectInfo
 import org.jetbrains.webwiz.models.Target
 
 class RootBuildGradle(val projectInfo: ProjectInfo) : ProjectFile {
     override val path = "build.gradle.kts"
     override val content: String
-        get() =
-            """
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-        ${if (projectInfo.kotlinVersion == KotlinVersion.Dev) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
-    }
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${projectInfo.kotlinVersion.versionName}")
-        ${if (projectInfo.dependencies.contains(KmpLibrary.SERIALIZATION)) "classpath(\"org.jetbrains.kotlin:kotlin-serialization:${projectInfo.kotlinVersion.versionName}\")" else NAN}
-        ${if (projectInfo.targets.contains(Target.ANDROID)) "classpath(\"com.android.tools.build:gradle:7.1.2\")" else NAN}
-        ${if (GradlePlugin.SQL_DELIGHT in projectInfo.gradlePlugins) "classpath(\"com.squareup.sqldelight:gradle-plugin:1.5.3\")" else NAN}
-        ${if (GradlePlugin.REALM in projectInfo.gradlePlugins) "classpath(\"io.realm.kotlin:gradle-plugin:0.9.0\")" else NAN}
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        ${if (projectInfo.kotlinVersion == KotlinVersion.Dev) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
-    }
-}
-    """.trimIndent().deleteNans()
+        get() = buildString {
+            appendLine("plugins {")
+            appendLine("    kotlin(\"multiplatform\").version(\"${projectInfo.kotlinVersion.versionName}\").apply(false)")
+            if (projectInfo.dependencies.contains(KmpLibrary.SERIALIZATION)) {
+                appendLine("    kotlin(\"plugin.serialization\").version(\"${projectInfo.kotlinVersion.versionName}\").apply(false)")
+            }
+            if (projectInfo.targets.contains(Target.ANDROID)) {
+                appendLine("    id(\"com.android.library\").version(\"7.2.0\").apply(false)")
+            }
+            if (GradlePlugin.SQL_DELIGHT in projectInfo.gradlePlugins) {
+                appendLine("    id(\"com.squareup.sqldelight\").version(\"1.5.3\").apply(false)")
+            }
+            if (GradlePlugin.REALM in projectInfo.gradlePlugins) {
+                appendLine("    id(\"io.realm.kotlin\").version(\"0.9.0\").apply(false)")
+            }
+            appendLine("}")
+        }
 }
diff --git a/src/commonMain/kotlin/org/jetbrains/webwiz/generator/files/SettingsGradle.kt b/src/commonMain/kotlin/org/jetbrains/webwiz/generator/files/SettingsGradle.kt
@@ -1,8 +1,14 @@
 package org.jetbrains.webwiz.generator.files
 
+import org.jetbrains.webwiz.generator.NAN
 import org.jetbrains.webwiz.generator.ProjectFile
+import org.jetbrains.webwiz.generator.deleteNans
 
-class SettingsGradle(val projectName: String, val moduleName: String) : ProjectFile {
+class SettingsGradle(
+    val projectName: String,
+    val moduleName: String,
+    val addDevMaven: Boolean
+) : ProjectFile {
     override val path = "settings.gradle.kts"
     override val content: String
         get() = """
@@ -11,10 +17,20 @@ pluginManagement {
         google()
         gradlePluginPortal()
         mavenCentral()
+        ${if (addDevMaven) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        ${if (addDevMaven) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
     }
 }
 
 rootProject.name = "${projectName.replace(' ', '_')}"
 include(":$moduleName")
-    """.trimIndent()
+    """.trimIndent().deleteNans()
 }
diff --git a/src/commonMain/kotlin/org/jetbrains/webwiz/generator/generator.kt b/src/commonMain/kotlin/org/jetbrains/webwiz/generator/generator.kt
@@ -2,6 +2,7 @@ package org.jetbrains.webwiz.generator
 
 import org.jetbrains.webwiz.generator.files.*
 import org.jetbrains.webwiz.models.GradlePlugin
+import org.jetbrains.webwiz.models.KotlinVersion
 import org.jetbrains.webwiz.models.ProjectInfo
 import org.jetbrains.webwiz.models.Target.ANDROID
 import org.jetbrains.webwiz.models.isCommonNativeTargetPresent
@@ -21,7 +22,7 @@ fun ProjectInfo.generate(): List<ProjectFile> = mutableListOf<ProjectFile>().app
     add(GradleWrapperJar())
 
     add(RootBuildGradle(info))
-    add(SettingsGradle(projectName, moduleName))
+    add(SettingsGradle(projectName, moduleName, kotlinVersion == KotlinVersion.EAP))
     add(GradleProperties())
 
     add(ModuleBuildGradle(info))

diff --git a/src/commonTest/kotlin/org/jetbrains/webwiz/generator/ProjectBuilderTest.kt b/src/commonTest/kotlin/org/jetbrains/webwiz/generator/ProjectBuilderTest.kt
@@ -297,6 +297,16 @@ internal class ProjectBuilderTest {
                     google()
                     gradlePluginPortal()
                     mavenCentral()
+                    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/")
+                }
+            }
+
+            dependencyResolutionManagement {
+                repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+                repositories {
+                    google()
+                    mavenCentral()
+                    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/")
                 }
             }