Merge pull request #50 from copper-leaf/dev

Dev

.github/workflows/push_dev.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 16]
+        java: [17]
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
     name: 'Test on ${{ matrix.os }} JDK ${{ matrix.java }}'
     runs-on: '${{ matrix.os }}'
@@ -51,11 +51,11 @@ jobs:
         with:
           submodules: 'recursive'
           fetch-depth: 0 # all commit history and tags
-      - name: 'Set up JDK 11'
+      - name: 'Set up JDK 17'
         uses: 'actions/setup-java@v2'
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: 'Assemble Artifacts'
         run: './gradlew build --stacktrace'
       - name: 'Publish Artifacts to MavenCentral Snapshots Repository'

.github/workflows/push_docs.yml

@@ -17,11 +17,11 @@ jobs:
         with:
           submodules: 'recursive'
           fetch-depth: 0 # all commit history and tags
-      - name: 'Set up JDK 11'
+      - name: 'Set up JDK 17'
         uses: 'actions/setup-java@v2'
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: 'Build example Compose Web site'
         run: './gradlew :examples:web:build --stacktrace -PreleaseDocs -PorchidEnvironment=prod'
       - name: 'Publish Documentation'

.github/workflows/push_features.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 16]
+        java: [17]
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
     name: 'Test on ${{ matrix.os }} JDK ${{ matrix.java }}'
     runs-on: '${{ matrix.os }}'
@@ -50,11 +50,11 @@ jobs:
         with:
           submodules: 'recursive'
           fetch-depth: 0 # all commit history and tags
-      - name: 'Set up JDK 11'
+      - name: 'Set up JDK 17'
         uses: 'actions/setup-java@v2'
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: 'Assemble Artifacts'
         run: './gradlew build --stacktrace'
       - name: 'Build IDEA Plugin'

.github/workflows/push_main.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 16]
+        java: [17]
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
     name: 'Test on ${{ matrix.os }} JDK ${{ matrix.java }}'
     runs-on: '${{ matrix.os }}'
@@ -50,11 +50,11 @@ jobs:
         with:
           submodules: 'recursive'
           fetch-depth: 0 # all commit history and tags
-      - name: 'Set up JDK 11'
+      - name: 'Set up JDK 17'
         uses: 'actions/setup-java@v2'
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: 'Assemble Artifacts'
         run: './gradlew assemble --stacktrace -Prelease -PorchidEnvironment=prod'
       - name: 'Publish IDEA Plugin'

CHANGELOG.md

@@ -1,12 +1,20 @@
-## 3.0.2 - 2022-06-08
+## 4.0.0 - 2023-09-05
+
+- Updates to Kotlin 1.9.10
+- The Debugger IntelliJ plugin now has functionality to send States and Inputs to connected ViewModels as JSON, which
+  gets parsed and handled on the device.
+- Several API improvements, including some breaking changes. See [v4 Migration Guide](https://copper-leaf.github.io/ballast/wiki/usage/migration/v4)
+    for full list of changes and instructions for updating your project.
+
+## 3.0.2 - 2023-06-08
 
 - Fixes regression where `awaitViewModelStart()` never calls a terminal Flow operator and doesn't actually suspend.
 
-## 3.0.1 - 2022-05-13
+## 3.0.1 - 2023-05-13
 
 - Fixes regression in BallastSavedStateInterceptor
 
-## 3.0.0 - 2022-05-07
+## 3.0.0 - 2023-05-07
 
 - Updates to Kotlin 1.8.20
 - Drops support for deprecated KMPP targets:

README.md

@@ -17,10 +17,10 @@ object TodosContract {
         val todos: List<String> = emptyList(), 
     )
 
-    sealed class Inputs {
-        object FetchSavedTodos : Inputs()
-        data class AddTodo(val text: String) : Inputs()
-        data class RemoveTodo(val text: String) : Inputs()
+    sealed interface Inputs {
+        data object FetchSavedTodos : Inputs
+        data class AddTodo(val text: String) : Inputs
+        data class RemoveTodo(val text: String) : Inputs
     }
 }
 

ballast-analytics/api/android/ballast-analytics.api

@@ -8,21 +8,14 @@ public final class com/copperleaf/ballast/analytics/AnalyticsInterceptor : com/c
 	public fun <init> (Lcom/copperleaf/ballast/analytics/AnalyticsTracker;Lcom/copperleaf/ballast/analytics/AnalyticsAdapter;)V
 	public fun <init> (Lcom/copperleaf/ballast/analytics/AnalyticsTracker;Lkotlin/jvm/functions/Function1;)V
 	public fun getKey ()Lcom/copperleaf/ballast/BallastInterceptor$Key;
-	public fun onNotify (Lcom/copperleaf/ballast/BallastLogger;Lcom/copperleaf/ballast/BallastNotification;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun start (Lcom/copperleaf/ballast/BallastInterceptorScope;Lkotlinx/coroutines/flow/Flow;)V
+	public fun toString ()Ljava/lang/String;
 }
 
 public abstract interface class com/copperleaf/ballast/analytics/AnalyticsTracker {
 	public abstract fun trackAnalyticsEvent (Ljava/lang/String;Ljava/util/Map;)V
 }
 
-public final class com/copperleaf/ballast/analytics/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-
 public final class com/copperleaf/ballast/analytics/DefaultAnalyticsAdapter : com/copperleaf/ballast/analytics/AnalyticsAdapter {
 	public fun <init> (Lkotlin/jvm/functions/Function1;)V
 	public fun getEventIdForInput (Ljava/lang/Object;)Ljava/lang/String;

ballast-analytics/api/jvm/ballast-analytics.api

@@ -8,8 +8,8 @@ public final class com/copperleaf/ballast/analytics/AnalyticsInterceptor : com/c
 	public fun <init> (Lcom/copperleaf/ballast/analytics/AnalyticsTracker;Lcom/copperleaf/ballast/analytics/AnalyticsAdapter;)V
 	public fun <init> (Lcom/copperleaf/ballast/analytics/AnalyticsTracker;Lkotlin/jvm/functions/Function1;)V
 	public fun getKey ()Lcom/copperleaf/ballast/BallastInterceptor$Key;
-	public fun onNotify (Lcom/copperleaf/ballast/BallastLogger;Lcom/copperleaf/ballast/BallastNotification;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun start (Lcom/copperleaf/ballast/BallastInterceptorScope;Lkotlinx/coroutines/flow/Flow;)V
+	public fun toString ()Ljava/lang/String;
 }
 
 public abstract interface class com/copperleaf/ballast/analytics/AnalyticsTracker {

ballast-analytics/build.gradle.kts

@@ -18,10 +18,7 @@ kotlin {
             dependencies { }
         }
         val androidMain by getting {
-            dependencies {
-                implementation(project.dependencies.platform(libs.firebase.bom))
-                implementation(libs.firebase.analytics)
-            }
+            dependencies { }
         }
         val jsMain by getting {
             dependencies { }

ballast-analytics/src/commonMain/kotlin/com/copperleaf/ballast/analytics/AnalyticsInterceptor.kt

@@ -42,4 +42,8 @@ public class AnalyticsInterceptor<Inputs : Any, Events : Any, State : Any>(
                 .collect()
         }
     }
+
+    override fun toString(): String {
+        return "AnalyticsInterceptor(tracker=$tracker)"
+    }
 }

ballast-analytics/src/commonTest/kotlin/com/copperleaf/ballast/analytics/BallastAnalyticsTests.kt

@@ -0,0 +1,23 @@
+package com.copperleaf.ballast.analytics
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
+
+class BallastAnalyticsTests : StringSpec({
+    "check toString values" {
+        AnalyticsInterceptor<Any, Any, Any>(
+            tracker = TestAnalyticsTracker(),
+            shouldTrackInput = { true },
+        ).toString() shouldBe "AnalyticsInterceptor(tracker=TestAnalyticsTracker)"
+    }
+})
+
+private class TestAnalyticsTracker : AnalyticsTracker {
+    override fun trackAnalyticsEvent(eventId: String, eventParameters: Map<String, String>) {
+        TODO("Not yet implemented")
+    }
+
+    override fun toString(): String {
+        return "TestAnalyticsTracker"
+    }
+}