Merge pull request #30 from JetBrains/fix_multiplatfrom_template

Fix multiplatform projects in IDEA / Android Studio

examples/imageviewer/build.gradle.kts

@@ -1,3 +1,17 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+
+    dependencies {
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev97")
+        classpath("com.android.tools.build:gradle:4.0.1")
+        classpath(kotlin("gradle-plugin", version = "1.4.0"))
+    }
+}
+
 allprojects {
     repositories {
         mavenLocal()

examples/imageviewer/desktop/build.gradle.kts

@@ -1,16 +1,25 @@
 import org.jetbrains.compose.compose
 
 plugins {
-    kotlin("jvm")
+    kotlin("multiplatform") // kotlin("jvm") doesn't work well in IDEA/AndroidStudio (https://github.com/JetBrains/compose-jb/issues/22)
     id("org.jetbrains.compose")
     java
     application
 }
 
+kotlin {
+    jvm {
+        withJava()
+    }
+    sourceSets {
+        named("jvmMain") {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(project(":common"))
             }
+        }
+    }
+}
 
 application {
     mainClassName = "example.imageviewer.MainKt"

examples/imageviewer/settings.gradle.kts

@@ -1,15 +1 @@
-buildscript {
-    repositories {
-        google()
-        jcenter()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev97")
-        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath(kotlin("gradle-plugin", version = "1.4.0"))
-    }
-}
-
 include(":common", ":android", ":desktop")

examples/issues/build.gradle.kts

@@ -1,3 +1,17 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+
+    dependencies {
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev97")
+        classpath("com.android.tools.build:gradle:4.0.1")
+        classpath(kotlin("gradle-plugin", version = "1.4.0"))
+    }
+}
+
 allprojects {
     repositories {
         mavenLocal()

examples/issues/desktop/build.gradle.kts

@@ -1,16 +1,25 @@
 import org.jetbrains.compose.compose
 
 plugins {
-    kotlin("jvm")
+    kotlin("multiplatform") // kotlin("jvm") doesn't work well in IDEA/AndroidStudio (https://github.com/JetBrains/compose-jb/issues/22)
     id("org.jetbrains.compose")
     java
     application
 }
 
+kotlin {
+    jvm {
+        withJava()
+    }
+    sourceSets {
+        named("jvmMain") {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(project(":common"))
             }
+        }
+    }
+}
 
 application {
     mainClassName = "androidx.ui.examples.jetissues.MainKt"

examples/issues/settings.gradle.kts

@@ -1,15 +1 @@
-buildscript {
-    repositories {
-        google()
-        jcenter()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev97")
-        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath(kotlin("gradle-plugin", version = "1.4.0"))
-    }
-}
-
 include(":common", ":android", ":desktop")

examples/todoapp/desktop/build.gradle.kts

@@ -1,12 +1,19 @@
 import org.jetbrains.compose.compose
 
 plugins {
-    kotlin("jvm")
+    kotlin("multiplatform") // kotlin("jvm") doesn't work well in IDEA/AndroidStudio (https://github.com/JetBrains/compose-jb/issues/22)
     id("org.jetbrains.compose")
     java
     application
 }
 
+kotlin {
+    jvm {
+        withJava()
+    }
+
+    sourceSets {
+        named("jvmMain") {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(project(":common:utils"))
@@ -18,6 +25,9 @@ dependencies {
                 implementation(Deps.Badoo.Reaktive.reaktive)
                 implementation(Deps.Badoo.Reaktive.coroutinesInterop)
             }
+        }
+    }
+}
 
 application {
     mainClassName = "example.todo.desktop.MainKt"

templates/multiplatform-template/build.gradle.kts

@@ -1,3 +1,19 @@
+buildscript {
+    val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev97"
+
+    repositories {
+        google()
+        jcenter()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+
+    dependencies {
+        classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
+        classpath("com.android.tools.build:gradle:4.0.1")
+        classpath(kotlin("gradle-plugin", version = "1.4.0"))
+    }
+}
+
 allprojects {
     repositories {
         google()

templates/multiplatform-template/desktop/build.gradle.kts

@@ -1,16 +1,25 @@
 import org.jetbrains.compose.compose
 
 plugins {
-    kotlin("jvm")
+    kotlin("multiplatform") // kotlin("jvm") doesn't work well in IDEA/AndroidStudio (https://github.com/JetBrains/compose-jb/issues/22)
     id("org.jetbrains.compose")
     java
     application
 }
 
+kotlin {
+    jvm {
+        withJava()
+    }
+    sourceSets {
+        named("jvmMain") {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(project(":common"))
             }
+        }
+    }
+}
 
 application {
     mainClassName = "MainKt"

templates/multiplatform-template/settings.gradle.kts

@@ -1,17 +1 @@
-buildscript {
-    val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev97"
-
-    repositories {
-        google()
-        jcenter()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
-        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath(kotlin("gradle-plugin", version = "1.4.0"))
-    }
-}
-
 include(":common", ":android", ":desktop")