chore: update project configuration with kotlin 1.9.10

README.md

@@ -68,7 +68,7 @@ kotlin {
 
 ### SwiftUI ###
 
-You need add the following file [Observer.kt](./mobk-swift/Observer.kt) to your
+You need add the following file [Observer.swift](./mobk-swift/Observer.swift) to your
 Xcode project. Be sure to replace the import line with the name of your Kotlin
 framework.
 

build.gradle.kts

@@ -0,0 +1,27 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("com.android.tools.build:gradle:8.1.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:1.5.1")
+    }
+}
+
+plugins {
+    kotlin("multiplatform") version "1.9.10"
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+kotlin {
+    jvm()
+}

gradle.properties

@@ -1 +1,2 @@
-android.useAndroidX=true
+android.useAndroidX=true
+org.jetbrains.compose.experimental.uikit.enabled=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 11 10:48:24 CEST 2021
+#Wed Sep 20 20:55:00 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

mobk-core/build.gradle.kts

@@ -0,0 +1,74 @@
+plugins {
+    kotlin("multiplatform")
+    id("com.android.library")
+    id("org.jetbrains.compose")
+    id("maven-publish")
+}
+
+group = "io.monkeypatch"
+version = "0.0.11"
+
+@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
+kotlin {
+    targetHierarchy.default()
+
+    androidTarget {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+
+        publishLibraryVariants("release")
+    }
+
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "shared"
+        }
+
+    }
+    sourceSets {
+        val commonMain by getting{
+            dependencies {
+                implementation(compose.runtime)
+                implementation(compose.foundation)
+                implementation("org.jetbrains.kotlinx:atomicfu:0.21.0")
+            }
+
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+        val iosMain by getting
+        val iosTest by getting
+    }
+}
+
+android {
+    namespace = "io.monkeypatch.mobk.core"
+    compileSdk = 34
+    defaultConfig {
+        minSdk = 24
+    }
+}
+
+
+
+publishing {
+    repositories {
+        maven{
+            url = uri("https://api.bintray.com/maven/alexandre-delattre/MonkeyPatchLibs/mobk-core/;publish=1")
+            credentials {
+                username = project.findProperty("bintrayUsername") as String? ?: ""
+                password = project.findProperty("bintrayPassword") as String? ?: ""
+            }
+        }
+    }
+}

mobk-compose/src/main/AndroidManifest.xml → mobk-core/src/androidMain/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest package="io.monkeypatch.mobk.ui"
+<manifest
           xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 

mobk-swift/Observer.swift

@@ -0,0 +1,39 @@
+//
+//  Observer.swift
+//
+
+import SwiftUI
+import <y>
+
+struct ObserverView<V: View> : View {
+    @ObservedObject var reactionObservable: ReactionObservable<V>
+
+    var body: some View {
+        self.reactionObservable.view
+    }
+}
+
+func Observer<V: View>(@ViewBuilder f: @escaping  () -> V) -> some View {
+    let reactionObservable = ReactionObservable(f: f)
+    return ObserverView(reactionObservable: reactionObservable)
+}
+
+class ReactionObservable<V>: ObservableObject {
+    @Published var view: V? = nil
+    var disposer: ReactionDisposer? = nil
+
+    init(f: @escaping () -> V) {
+        disposer = ApiKt.autorun { [weak self] in
+            self?.view = f()
+        }
+    }
+
+    deinit {
+        let d = disposer
+        disposer = nil
+        DispatchQueue.main.async {
+            d?.invoke()
+        }
+    }
+
+}

settings.gradle.kts

@@ -0,0 +1,2 @@
+rootProject.name = "mobk"
+include(":mobk-core")