Cleanup and use compose-jb

Author: cl3m

androidApp/build.gradle.kts

@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion(AndroidSdk.compile)
+    compileSdk = AndroidSdk.compile
     defaultConfig {
         applicationId = "com.rouge41.kmm.compose.androidApp"
-        minSdkVersion(AndroidSdk.min)
-        targetSdkVersion(AndroidSdk.target)
+        minSdk = AndroidSdk.min
+        targetSdk = AndroidSdk.target
         versionCode = 1
         versionName = "1.0"
     }
@@ -28,21 +28,18 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = Version.compose
+        kotlinCompilerExtensionVersion = Version.compose_compiler
     }
 }
 
 dependencies {
-    implementation(Android.appcompact)
-    implementation(Android.material)
-
-    implementation(project(":multiplatform-compose"))
     implementation(project(":test"))
 
+    implementation(Android.appcompat)
+    implementation(Android.material)
+
     implementation(Compose.runtime)
     implementation(Compose.ui)
     implementation(Compose.foundationLayout)
     implementation(Compose.material)
-    implementation(Compose.runtimeLiveData)
-    implementation(Compose.navigation)
-}
+}

androidApp/src/main/java/com/rouge41/kmm/compose/androidApp/MainActivity.kt

@@ -2,28 +2,20 @@ package com.rouge41.kmm.compose.androidApp
 
 import android.graphics.Color
 import android.os.Bundle
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.ui.platform.ComposeView
-import com.rouge41.kmm.compose.test.Content
-import com.rouge41.kmm.compose.test.Resources
+import com.rouge41.kmm.compose.RootView
+import moe.tlaster.precompose.lifecycle.PreComposeActivity
+import moe.tlaster.precompose.lifecycle.setContent
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : PreComposeActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
 
-        //has to be set in code or in theme
+        // has to be set in code or in theme
         window.decorView.setBackgroundColor(Color.WHITE)
         window.statusBarColor = Color.parseColor("#cc7000")
-        //window.statusBarColor = Color.WHITE
-        //window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
 
-        val cv: ComposeView = findViewById(R.id.compose_view)
-        val resources = Resources(logo = R.drawable.logo)
-
-        cv.setContent {
-            Content(resources)
+        setContent {
+            RootView()
         }
     }
 }

androidApp/src/main/res/layout/activity_main.xml

@@ -1,13 +1,16 @@
 buildscript {
     repositories {
         gradlePluginPortal()
-        jcenter()
         google()
+        jcenter()
         mavenCentral()
+        maven("https://jitpack.io")
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Version.kotlin}")
-        classpath("com.android.tools.build:gradle:7.1.2")
+        classpath(Kotlin.gradle)
+        classpath(Android.gradle)
+        classpath(Kotlin.serialization)
     }
 }
 
@@ -16,5 +19,6 @@ allprojects {
         google()
         jcenter()
         mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }

build.gradle.kts

@@ -1,11 +1,7 @@
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 plugins {
     `kotlin-dsl`
 }
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
-}

buildSrc/build.gradle.kts

@@ -1,25 +1,19 @@
 
 object Version {
-    const val kotlin = "1.6.10"
-
+    const val kotlin = "1.7.20"
+    const val gradle = "7.3.1"
     const val appcompat = "1.4.0"
     const val material = "1.4.0"
-
-    const val compose = "1.1.0"
-    const val nav_compose = "2.4.1"
-
-    const val yoga = "~> 1.7"
-
-    const val junit = "4.13"
-
-    const val coil = "1.4.0"
-    const val coroutines = "1.5.2"
+    const val compose = "1.2.1"
+    const val compose_compiler = "1.3.2"
+    const val precompose = "1.3.9"
+    const val ktor = "2.1.2"
 }
 
 
 object AndroidSdk {
-    const val min = 24
-    const val compile = 31
+    const val min = 21
+    const val compile = 33
     const val target = compile
 }
 
@@ -28,23 +22,32 @@ object iOSSdk {
 }
 
 object Android {
-    const val appcompact = "androidx.appcompat:appcompat:${Version.appcompat}"
+    const val appcompat = "androidx.appcompat:appcompat:${Version.appcompat}"
     const val material = "com.google.android.material:material:${Version.material}"
+    const val gradle = "com.android.tools.build:gradle:${Version.gradle}"
 }
 
 object Compose {
     const val runtime = "androidx.compose.runtime:runtime:${Version.compose}"
     const val ui = "androidx.compose.ui:ui:${Version.compose}"
     const val foundationLayout = "androidx.compose.foundation:foundation-layout:${Version.compose}"
     const val material = "androidx.compose.material:material:${Version.compose}"
-    const val runtimeLiveData = "androidx.compose.runtime:runtime-livedata:${Version.compose}"
-    const val navigation = "androidx.navigation:navigation-compose:${Version.nav_compose}"
 }
 
-object Coil {
-    const val coil = "io.coil-kt:coil:${Version.coil}"
+object Kotlin {
+    const val gradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Version.kotlin}"
+    const val serialization = "org.jetbrains.kotlin:kotlin-serialization:${Version.kotlin}"
 }
 
-object Kotlinx {
-    const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.coroutines}"
-}
+const val precompose = "moe.tlaster:precompose:${Version.precompose}"
+
+object Ktor {
+    const val client_core = "io.ktor:ktor-client-core:${Version.ktor}"
+    const val client_content_negotiation = "io.ktor:ktor-client-content-negotiation:${Version.ktor}"
+    const val client_logging = "io.ktor:ktor-client-logging:${Version.ktor}"
+    const val serialization_json = "io.ktor:ktor-serialization-kotlinx-json:${Version.ktor}"
+    const val client_logging_jvm = "io.ktor:ktor-client-logging-jvm:${Version.ktor}"
+    const val client_json_jvm = "io.ktor:ktor-client-json-jvm:${Version.ktor}"
+    const val client_android = "io.ktor:ktor-client-android:${Version.ktor}"
+    const val client_ios = "io.ktor:ktor-client-ios:${Version.ktor}"
+}

buildSrc/src/main/kotlin/Dependencies.kt

@@ -1,5 +1,13 @@
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
 kotlin.code.style=official
-xcodeproj=./iosApp
 android.useAndroidX=true
+
+#MPP
+xcodeproj=./iosApp
 kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
+kotlin.native.enableDependencyPropagation=false
+kotlin.native.binary.memoryModel=experimental
+kotlin.mpp.enableCInteropCommonization=true
+org.jetbrains.compose.experimental.uikit.enabled=true

gradle.properties

@@ -1,6 +1,6 @@
-#Fri Jan 22 09:15:46 CET 2021
+#Fri Nov 18 11:12:20 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,33 +1,16 @@
-# Uncomment the next line to define a global platform for your project
-platform :ios, '9.0'
-inhibit_all_warnings!
+source 'https://cdn.cocoapods.org'
+platform :ios, '11.0'
 
 target 'iosApp' do
-  # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
-
-#  pod 'multiplatform_compose', :path => '../multiplatform-compose'
   pod 'test', :path => '../test'
-
-  target 'iosAppTests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
-
-  target 'iosAppUITests' do
-    # Pods for testing
-  end
-
 end
 
-# See https://stackoverflow.com/questions/37160688/set-deployment-target-for-cocoapodss-pod/51416359#51416359
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
       # Force CocoaPods targets to always build for x86_64
       config.build_settings['ARCHS[sdk=iphonesimulator*]'] = 'x86_64'
     end
   end
 end
-

iosApp/Podfile

@@ -1,27 +1,16 @@
 PODS:
-  - test (0.0.1):
-    - YogaKit (~> 1.7)
-  - Yoga (1.14.0)
-  - YogaKit (1.18.1):
-    - Yoga (~> 1.14)
+  - test (0.0.1)
 
 DEPENDENCIES:
   - test (from `../test`)
 
-SPEC REPOS:
-  trunk:
-    - Yoga
-    - YogaKit
-
 EXTERNAL SOURCES:
   test:
     :path: "../test"
 
 SPEC CHECKSUMS:
-  test: 72859298f3559094e4087550d7dc622688572e28
-  Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
-  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
+  test: 66942bf3e61e1e990f5e0fe8ca47b3dbf12d7d21
 
-PODFILE CHECKSUM: 7550d818c61fa360b8651061baef62b99f2fe5b7
+PODFILE CHECKSUM: 70f60dbd5c685328388ed16cc67b87bab84535fc
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3