v2 KMP support

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: cimg/android:2023.07
+      - image: cimg/android:2025.04
     environment:
       JVM_OPTS: -Xmx3200m
       GRADLE_OPTS: -Dorg.gradle.daemon=true
@@ -12,7 +12,7 @@ jobs:
       - checkout
       - restore_cache:
           # bump the cache version number if you want to wipe the gradle cache
-          key: v6-gradle-dependencies-cache
+          key: v7-gradle-dependencies-cache
 #      - run:
 #         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
 #         command: sudo chmod +x ./gradlew
@@ -22,116 +22,77 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: v6-gradle-dependencies-cache
+          key: v7-gradle-dependencies-cache
 
       - run:
-          name: Run Tests fore-jv-android
-          command: ./gradlew fore-jv:fore-jv-android:lintRelease fore-jv:fore-jv-android:testRelease
+          name: Run Tests fore-compose
+          command: ./gradlew lib:fore-compose:lintRelease lib:fore-compose:testRelease
       - store_artifacts:
-          path: fore-jv/fore-jv-android/build/reports
+          path: lib/fore-compose/build/reports
       - store_test_results:
-          path: fore-jv/fore-jv-android/build/test-results
+          path: lib/fore-compose/build/test-results
 
       - run:
-          name: Run Tests fore-kt-android
-          command: ./gradlew fore-kt:fore-kt-android:lintRelease fore-kt:fore-kt-android:testRelease
+          name: Run Tests fore-core
+          command: ./gradlew lib:fore-core:lintRelease lib:fore-core:testRelease
       - store_artifacts:
-          path: fore-kt/fore-kt-android/build/reports
+          path: lib/fore-core/build/reports
       - store_test_results:
-          path: fore-kt/fore-kt-android/build/test-results
+          path: lib/fore-core/build/test-results
 
       - run:
-          name: Run Tests example-jv-01reactiveui
-          command: ./gradlew app-examples:example-jv-01reactiveui:lintRelease app-examples:example-jv-01reactiveui:testRelease
+          name: Run Tests fore-net
+          command: ./gradlew lib:fore-net:lintRelease lib:fore-net:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-01reactiveui/build/reports
+          path: lib/fore-net/build/reports
       - store_test_results:
-          path: app-examples/example-jv-01reactiveui/build/test-results
+          path: lib/fore-net/build/test-results
 
       - run:
-          name: Run Tests example-jv-02threading
-          command: ./gradlew app-examples:example-jv-02threading:lintRelease app-examples:example-jv-02threading:testRelease
+          name: Run Tests example-01-reactiveui
+          command: ./gradlew app-examples:example-01-reactiveui:lintRelease app-examples:example-01-reactiveui:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-02threading/build/reports
+          path: app-examples/example-01-reactiveui/build/reports
       - store_test_results:
-          path: app-examples/example-jv-02threading/build/test-results
+          path: app-examples/example-01-reactiveui/build/test-results
 
       - run:
-          name: Run Tests example-jv-03adapters
-          command: ./gradlew app-examples:example-jv-03adapters:lintRelease app-examples:example-jv-03adapters:testRelease
+          name: Run Tests example-02-coroutine
+          command: ./gradlew app-examples:example-02-coroutine:lintRelease app-examples:example-02-coroutine:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-03adapters/build/reports
+          path: app-examples/example-02-coroutine/build/reports
       - store_test_results:
-          path: app-examples/example-jv-03adapters/build/test-results
+          path: app-examples/example-02-coroutine/build/test-results
 
       - run:
-          name: Run Tests example-jv-04retrofit
-          command: ./gradlew app-examples:example-jv-04retrofit:lintRelease app-examples:example-jv-04retrofit:testRelease
+          name: Run Tests example-03-ktor
+          command: ./gradlew app-examples:example-03-ktor:lintRelease app-examples:example-03-ktor:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-04retrofit/build/reports
+          path: app-examples/example-03-ktor/build/reports
       - store_test_results:
-          path: app-examples/example-jv-04retrofit/build/test-results
+          path: app-examples/example-03-ktor/build/test-results
 
       - run:
-          name: Run Tests example-jv-06db
-          command: ./gradlew app-examples:example-jv-06db:lintRelease app-examples:example-jv-06db:testRelease
+          name: Run Tests example-04-apollo
+          command: ./gradlew app-examples:example-04-apollo:lintRelease app-examples:example-04-apollo:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-06db/build/reports
+          path: app-examples/example-04-apollo/build/reports
       - store_test_results:
-          path: app-examples/example-jv-06db/build/test-results
+          path: app-examples/example-04-apollo/build/test-results
 
-      - run:
-          name: Run Tests example-kt-01reactiveui
-          command: ./gradlew app-examples:example-kt-01reactiveui:lintRelease app-examples:example-kt-01reactiveui:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-01reactiveui/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-01reactiveui/build/test-results
-
-      - run:
-          name: Run Tests example-kt-02coroutine
-          command: ./gradlew app-examples:example-kt-02coroutine:lintRelease app-examples:example-kt-02coroutine:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-02coroutine/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-02coroutine/build/test-results
-
-      - run:
-          name: Run Tests example-kt-03adapters
-          command: ./gradlew app-examples:example-kt-03adapters:lintRelease app-examples:example-kt-03adapters:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-03adapters/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-03adapters/build/test-results
-
-      - run:
-          name: Run Tests example-kt-04retrofit
-          command: ./gradlew app-examples:example-kt-04retrofit:lintRelease app-examples:example-kt-04retrofit:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-04retrofit/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-04retrofit/build/test-results
-
-      - run:
-          name: Run Tests example-kt-07apollo3
-          command: ./gradlew app-examples:example-kt-07apollo3:lintRelease app-examples:example-kt-07apollo3:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-07apollo3/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-07apollo3/build/test-results
+#      - run:
+#          name: Run Tests example-05-db
+#          command: ./gradlew app-examples:example-05-db:lintRelease app-examples:example-05-db:testRelease
+#      - store_artifacts:
+#          path: app-examples/example-05-db/build/reports
+#      - store_test_results:
+#          path: app-examples/example-05-db/build/test-results
 
       - run:
-          name: Run Tests example-kt-08ktor
-          command: ./gradlew app-examples:example-kt-08ktor:lintRelease app-examples:example-kt-08ktor:testRelease
+          name: Run Tests example-06-compose
+          command: ./gradlew app-examples:example-06-compose:lintRelease app-examples:example-06-compose:testRelease
       - store_artifacts:
-          path: app-examples/example-kt-08ktor/build/reports
+          path: app-examples/example-06-compose/build/reports
       - store_test_results:
-          path: app-examples/example-kt-08ktor/build/test-results
+          path: app-examples/example-06-compose/build/test-results
 
-      - run:
-          name: Run Tests example-kt-09compose
-          command: ./gradlew app-examples:example-kt-09compose:lintRelease app-examples:example-kt-09compose:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-09compose/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-09compose/build/test-results

.gitignore

@@ -71,3 +71,8 @@ secret_key_ring.gpg
 
 # passwords
 secrets.properties
+
+# Ignore Kotlin/Native metadata and build artifacts
+.kotlin/
+
+**/iosApp/Frameworks/

app-examples/example-kt-01reactiveui/build.gradle.kts → app-examples/example-01-reactiveui/build.gradle.kts

@@ -2,9 +2,9 @@ import co.early.fore.Shared
 import co.early.fore.Shared.BuildTypes
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    kotlin("kapt")
+    alias(libs.plugins.androidAppPlugin)
+    alias(libs.plugins.kotlinAndroidPlugin)
+    alias(libs.plugins.kotlinKaptPlugin)
 }
 
 
@@ -18,7 +18,7 @@ println("[$appId testBuildType:${getTestBuildType()}]")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
     }
 }
 
@@ -68,9 +68,11 @@ android {
 dependencies {
 
     if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android-core:${Shared.Publish.published_fore_version_for_examples}")
+        implementation(libs.fore.core)
+        testImplementation(libs.fore.test.fixtures)
     } else {
-        implementation(project(":fore-kt:fore-kt-android-core"))
+        implementation(project(":lib:fore-core"))
+        testImplementation(project(":lib:fore-test-fixtures"))
     }
 
     implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")

app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt → app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt

@@ -1,8 +1,8 @@
 package foo.bar.example.forereactiveuikt
 
 import android.app.Application
-import co.early.fore.kt.core.delegate.DebugDelegateDefault
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.DebugDelegateDefault
+import co.early.fore.core.delegate.Fore
 
 /**
  * Copyright © 2015-2020 early.co. All rights reserved.

app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt → app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt

@@ -1,7 +1,8 @@
 package foo.bar.example.forereactiveuikt
 
 import android.app.Application
-import co.early.fore.kt.core.logging.AndroidLogger
+import co.early.fore.core.logging.AndroidLogger
+//import co.early.fore.core.logging.AndroidLogger
 import foo.bar.example.forereactiveuikt.feature.wallet.Wallet
 import java.util.HashMap
 

app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt → app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt

@@ -1,8 +1,8 @@
 package foo.bar.example.forereactiveuikt.feature.wallet
 
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.observer.ObservableImp
+import co.early.fore.core.observer.ObservableImp
 
 /**
  * Copyright © 2015-2020 early.co. All rights reserved.

app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt → app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt

@@ -2,8 +2,13 @@ package foo.bar.example.forereactiveuikt.ui.wallet
 
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
+import co.early.fore.core.delegate.Fore
+/**
+ * example 1/3 without using the LifecycleObserver
+ */
+//import co.early.fore.core.observer.Observer
 import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.ui.LifecycleObserver
+import co.early.fore.core.ui.ForeLifecycleObserver
 import foo.bar.example.forereactiveuikt.OG
 import foo.bar.example.forereactiveuikt.databinding.ActivityWalletBinding
 import foo.bar.example.forereactiveuikt.feature.wallet.Wallet
@@ -18,13 +23,20 @@ class WalletsActivity : FragmentActivity(), SyncableView {
 
     private lateinit var binding: ActivityWalletBinding
 
+    /**
+     * example 2/3 without using the LifecycleObserver
+     */
+//    var observer: Observer = Observer { syncView() }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        Fore.i("onCreate()")
+
         binding = ActivityWalletBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        lifecycle.addObserver(LifecycleObserver(this, wallet))
+        lifecycle.addObserver(ForeLifecycleObserver(this, wallet))
 
         setupButtonClickListeners()
     }
@@ -39,9 +51,25 @@ class WalletsActivity : FragmentActivity(), SyncableView {
     }
 
     override fun syncView() {
+
+        Fore.i("syncView()")
+
         binding.walletIncreaseBtn.isEnabled = wallet.canIncrease()
         binding.walletDecreaseBtn.isEnabled = wallet.canDecrease()
         binding.walletMobileamountTxt.text = wallet.mobileWalletAmount.toString()
         binding.walletSavingsamountTxt.text = wallet.savingsWalletAmount.toString()
     }
+
+    /**
+     * example 3/3 without using the LifecycleObserver
+     */
+//    override fun onStart() {
+//        super.onStart()
+//        wallet.addObserver(observer)
+//        syncView() //  <- don't forget this
+//    }
+//    override fun onStop() {
+//        super.onStop()
+//        wallet.removeObserver(observer)
+//    }
 }

app-examples/example-kt-01reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt → app-examples/example-01-reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt

@@ -1,10 +1,10 @@
 package foo.bar.example.forereactiveuikt.feature.wallet
 
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.logging.SystemLogger
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.logging.SystemLogger
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import co.early.fore.core.delegate.Fore
 import io.mockk.MockKAnnotations
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify

app-examples/example-kt-02coroutine/build.gradle.kts → app-examples/example-02-coroutine/build.gradle.kts

@@ -2,9 +2,9 @@ import co.early.fore.Shared
 import co.early.fore.Shared.BuildTypes
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    kotlin("kapt")
+    alias(libs.plugins.androidAppPlugin)
+    alias(libs.plugins.kotlinAndroidPlugin)
+    alias(libs.plugins.kotlinKaptPlugin)
 }
 
 val appId = "foo.bar.example.forecoroutine"
@@ -17,7 +17,7 @@ println("[$appId testBuildType:${getTestBuildType()}]")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
     }
 }
 
@@ -67,13 +67,14 @@ android {
 dependencies {
 
     if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android-core:${Shared.Publish.published_fore_version_for_examples}")
+        implementation(libs.fore.core)
+        testImplementation(libs.fore.test.fixtures)
     } else {
-        implementation(project(":fore-kt:fore-kt-android-core"))
+        implementation(project(":lib:fore-core"))
+        testImplementation(project(":lib:fore-test-fixtures"))
     }
 
     implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
 
     testImplementation("junit:junit:${Shared.Versions.junit}")
     testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")

app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt → app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt

@@ -1,8 +1,7 @@
 package foo.bar.example.forecoroutine
 
 import android.app.Application
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.AndroidLogger
+import co.early.fore.core.logging.AndroidLogger
 import foo.bar.example.forecoroutine.feature.counter.Counter
 import foo.bar.example.forecoroutine.feature.counter.CounterWithProgress
 import java.util.HashMap

app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt → app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt

@@ -2,12 +2,12 @@ package foo.bar.example.forecoroutine.feature.counter
 
 
 import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.coroutine.awaitDefault
-import co.early.fore.kt.core.coroutine.launchMain
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.observer.ObservableImp
+import co.early.fore.core.coroutine.awaitDefault
+import co.early.fore.core.coroutine.launchMain
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.observer.ObservableImp
 import kotlinx.coroutines.delay
 
 /**