Merge pull request JetBrains#146 from JetBrains/marton/remove-mobilemain

Remove mobileMain source set

Author: zsmb13

.github/workflows/build-all.yml

@@ -2,6 +2,10 @@ name: Build all apps
 on:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 jobs:
   build-jvm:
     name: Build desktop

shared/src/mobileMain/resources/drawable/splash_screen_bird.xml renamed to androidApp/src/androidMain/res/drawable/splash_screen_bird.xml

@@ -14,7 +14,7 @@
       android:pathData="M75.29,125.63C89.11,139.02 111.14,138.87 124.79,125.21L149.75,100.22L124.73,75.17C111.53,61.95 90.48,61.39 76.62,73.47L74.87,75.23C61.59,88.53 61.1,109.78 73.4,123.66C73.85,124.17 74.32,124.66 74.81,125.15L75.29,125.63Z"
       android:fillType="evenOdd">
     <aapt:attr name="android:fillColor">
-      <gradient 
+      <gradient
           android:startX="149.75"
           android:startY="100.19"
           android:endX="64.52"
@@ -29,7 +29,7 @@
   <path
       android:pathData="M0,49.92C22.39,27.84 30.54,14.64 49.95,14.64C69.43,14.64 85.22,30.48 85.22,50.02C85.22,69.56 69.43,85.39 49.95,85.39C30.54,85.39 22.39,72.06 0,49.92Z">
     <aapt:attr name="android:fillColor">
-      <gradient 
+      <gradient
           android:startX="-5.73"
           android:startY="50.15"
           android:endX="85.1"

shared/build.gradle.kts

@@ -46,102 +46,66 @@ kotlin {
         }
     }
 
+    // Required as we create additional custom source sets below
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
-          val commonMain by getting {
-            dependencies {
-                compileOnly(compose.runtime)
+        commonMain.dependencies {
+            api(compose.runtime)
+            api(compose.foundation)
+            api(compose.animation)
+            api(compose.material)
+            api(compose.components.resources)
 
-                api(libs.components.ui.tooling.preview)
-                api(compose.components.resources)
+            api(libs.components.ui.tooling.preview)
 
-                api(libs.ktor.client.logging)
-                api(libs.ktor.serialization.kotlinx.json)
-                api(libs.ktor.client.content.negotiation)
-                api(libs.ktor.utils)
+            api(libs.ktor.client.logging)
+            api(libs.ktor.serialization.kotlinx.json)
+            api(libs.ktor.client.content.negotiation)
+            api(libs.ktor.utils)
 
-                implementation(libs.kotlinx.datetime)
-                implementation(libs.material3)
-            }
-        }
+            implementation(libs.kotlinx.datetime)
+            implementation(libs.material3)
 
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test"))
-            }
-        }
+            implementation(libs.androidx.navigation.compose)
+            implementation(libs.multiplatform.markdown.renderer.m3)
+            implementation(libs.ktor.client.core)
 
-        val mobileMain by creating {
-            dependsOn(commonMain)
-            dependencies {
-                api(compose.runtime)
-                api(compose.foundation)
-                api(compose.animation)
-                api(compose.material)
-                api(compose.components.resources)
-
-                implementation(libs.androidx.navigation.compose)
-                implementation(libs.multiplatform.markdown.renderer.m3)
-                implementation(libs.ktor.client.core)
-
-                api(libs.image.loader)
-            }
+            api(libs.image.loader)
         }
 
-        val mobileTest by creating {
-            dependsOn(mobileMain)
-            dependsOn(commonTest)
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
 
-        val androidMain by getting {
-            dependsOn(mobileMain)
+        androidMain.dependencies {
+            implementation(compose.runtime)
+            implementation(compose.foundation)
+            implementation(compose.material)
+            implementation(compose.ui)
+            implementation(compose.components.resources)
 
-            dependencies {
-                implementation(compose.runtime)
-                implementation(compose.foundation)
-                implementation(compose.material)
-                implementation(compose.ui)
-                implementation(compose.components.resources)
-
-                implementation(libs.android.svg)
-                implementation(libs.androidx.core.ktx)
-                implementation(libs.androidx.work.runtime)
-                implementation(libs.androidx.preference)
-                implementation(libs.compose.ui.tooling.preview)
-
-                implementation(libs.ktor.client.cio)
-            }
+            implementation(libs.android.svg)
+            implementation(libs.androidx.core.ktx)
+            implementation(libs.androidx.work.runtime)
+            implementation(libs.androidx.preference)
+            implementation(libs.compose.ui.tooling.preview)
 
-            resources.srcDirs("src/commonMain/resources", "src/mobileMain/resources")
+            implementation(libs.ktor.client.cio)
         }
 
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-
-        val iosMain by creating {
-            dependsOn(mobileMain)
-
-            dependencies {
-                implementation(libs.ktor.client.darwin)
-            }
-
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
+        iosMain.dependencies {
+            implementation(libs.ktor.client.darwin)
         }
 
-        val jvmMain by getting {
-            dependsOn(mobileMain)
-
-            dependencies {
-                implementation(libs.ktor.client.cio)
-                implementation(compose.desktop.currentOs)
-                implementation(libs.android.svg)
-            }
+        jvmMain.dependencies {
+            implementation(libs.ktor.client.cio)
+            implementation(compose.desktop.currentOs)
+            implementation(libs.android.svg)
         }
-        val webMain by creating {
-            dependsOn(mobileMain)
 
+        val webMain by creating {
+            dependsOn(commonMain.get())
             dependencies {
                 implementation(libs.ktor.client.js)
             }
@@ -151,7 +115,7 @@ kotlin {
             dependsOn(webMain)
         }
 
-        val jsMain by getting {
+        jsMain {
             dependsOn(webMain)
         }
     }
@@ -161,10 +125,6 @@ android {
     namespace = "org.jetbrains.kotlinconf"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
 
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/mobileMain/resources")
-    sourceSets["main"].resources.srcDirs("src/mobileMain/resources")
-
     defaultConfig {
         targetSdk = libs.versions.android.targetSdk.get().toInt()
         minSdk = libs.versions.android.minSdk.get().toInt()
@@ -199,7 +159,7 @@ val buildWebApp by tasks.creating(Copy::class) {
     val jsWebpack = "jsBrowserProductionWebpack"
 
     dependsOn(wasmWebpack, jsWebpack)
-    
+
     // TODO could be removed after migration to Kotlin 2.0+
     kotlin.wasmJs {
         applyBinaryen()

shared/shared.podspec

@@ -35,5 +35,5 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-    spec.resources = ['src/commonMain/resources/**', 'src/iosMain/resources/**', 'src/mobileMain/resources/**']
+    spec.resources = ['src/commonMain/resources/**', 'src/iosMain/resources/**']
 end