RotBolt · RotBolt · Aug 31, 2023 · Aug 30, 2023 · Aug 31, 2023
diff --git a/.github/workflows/flaker-ci.yml b/.github/workflows/flaker-ci.yml
@@ -8,11 +8,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '11'
 
       - name: Inject Secrets
         env:

diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@
 .cxx
 local.properties
 secrets.properties
+flakerKeyStore.jks
 site
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.org.jetbrains.kotlin.jvm) apply false
     alias(libs.plugins.androidTest) apply false
+    alias(libs.plugins.gradle.mavenpublish) apply false
 }
 
 allprojects {

diff --git a/flaker-android-ktor/build.gradle.kts b/flaker-android-ktor/build.gradle.kts
@@ -2,8 +2,11 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.gradle.mavenpublish)
 }
 
+version = "0.1.0"
+
 android {
     namespace = "io.rotlabs.flakerandroidktor"
     compileSdk = 33
@@ -19,17 +22,20 @@ android {
     }
 
     buildTypes {
+        debug {
+            isMinifyEnabled = false
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
     buildFeatures {
         compose = true

diff --git a/flaker-android-ktor/gradle.properties b/flaker-android-ktor/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=io.rotlabs
+POM_ARTIFACT_ID=flaker-android-ktor
+VERSION_NAME=0.1.0
diff --git a/flaker-android-monitor/build.gradle.kts b/flaker-android-monitor/build.gradle.kts
@@ -5,12 +5,15 @@ import java.io.FileInputStream
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.gradle.mavenpublish)
 }
 
 val secretsPropertiesFile = rootProject.file("secrets.properties")
 val secretProperties = Properties()
 secretProperties.load(FileInputStream(secretsPropertiesFile))
 
+version = "0.1.0"
+
 android {
     namespace = "io.rotlabs.flakerandroidmonitor"
     compileSdk = 34
@@ -28,17 +31,20 @@ android {
     }
 
     buildTypes {
+        debug {
+            isMinifyEnabled = false
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
 }
 

diff --git a/flaker-android-monitor/gradle.properties b/flaker-android-monitor/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=io.rotlabs
+POM_ARTIFACT_ID=flaker-android-monitor
+VERSION_NAME=0.1.0
diff --git a/flaker-android-okhttp/build.gradle.kts b/flaker-android-okhttp/build.gradle.kts
@@ -2,12 +2,14 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.gradle.mavenpublish)
 }
 
+version = "0.1.0"
+
 android {
     namespace = "io.rotlabs.flakerandroidokhttp"
     compileSdk = 33
-    version = "0.1.0"
 
     defaultConfig {
         minSdk = 24
@@ -24,16 +26,16 @@ android {
             isMinifyEnabled = false
         }
         release {
-            isMinifyEnabled = true
+            isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
     buildFeatures {
         compose = true

diff --git a/flaker-android-okhttp/gradle.properties b/flaker-android-okhttp/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=io.rotlabs
+POM_ARTIFACT_ID=flaker-android-okhttp
+VERSION_NAME=0.1.0
diff --git a/flaker-android-okhttp/src/main/java/io/rotlabs/flakerandroidokhttp/ui/FlakerViewModel.kt b/flaker-android-okhttp/src/main/java/io/rotlabs/flakerandroidokhttp/ui/FlakerViewModel.kt
@@ -83,7 +83,13 @@ class FlakerViewModel(
     }
 
     fun toggleFlaker(value: Boolean) {
-        viewModelScope.launch {
+        val coroutineExceptionHandler = CoroutineExceptionHandler { _, throwable ->
+            flakerMonitor.captureException(
+                throwable,
+                mapOf(TAG to "Error while toggling flaker: ${throwable.message}")
+            )
+        }
+        viewModelScope.launch(coroutineExceptionHandler) {
             prefDataStore.savePrefs(prefDataStore.getPrefs().first().copy(shouldIntercept = value))
         }
     }
@@ -110,7 +116,13 @@ class FlakerViewModel(
     }
 
     fun updatePrefs(flakerPrefsUiDto: FlakerPrefsUiDto) {
-        viewModelScope.launch {
+        val coroutineExceptionHandler = CoroutineExceptionHandler { _, throwable ->
+            flakerMonitor.captureException(
+                throwable,
+                mapOf(TAG to "Error while saving prefs: ${throwable.message}")
+            )
+        }
+        viewModelScope.launch(coroutineExceptionHandler) {
             prefDataStore.savePrefs(
                 FlakerPrefs(
                     shouldIntercept = true,

diff --git a/flaker-android-ui/build.gradle.kts b/flaker-android-ui/build.gradle.kts
@@ -2,12 +2,14 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.gradle.mavenpublish)
 }
 
+version = "0.1.0"
+
 android {
     namespace = "io.rotlabs.flakerandroidui"
     compileSdk = 33
-    version = "0.1.0"
 
     defaultConfig {
         minSdk = 24
@@ -20,17 +22,20 @@ android {
     }
 
     buildTypes {
+        debug {
+            isMinifyEnabled = false
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
     buildFeatures {
         compose = true

diff --git a/flaker-android-ui/consumer-rules.pro b/flaker-android-ui/consumer-rules.pro
diff --git a/flaker-android-ui/gradle.properties b/flaker-android-ui/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=io.rotlabs
+POM_ARTIFACT_ID=flaker-android-ui
+VERSION_NAME=0.1.0
diff --git a/flaker-android/build.gradle.kts b/flaker-android/build.gradle.kts
@@ -2,8 +2,11 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.gradle.mavenpublish)
 }
 
+version = "0.1.0"
+
 android {
     namespace = "io.rotlabs.flakerandroid"
     compileSdk = 33
@@ -19,17 +22,20 @@ android {
     }
 
     buildTypes {
+        debug {
+            isMinifyEnabled = false
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
     buildFeatures {
         compose = true

diff --git a/flaker-android/gradle.properties b/flaker-android/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=io.rotlabs
+POM_ARTIFACT_ID=flaker-android
+VERSION_NAME=0.1.0
diff --git a/flaker-data/build.gradle.kts b/flaker-data/build.gradle.kts
@@ -6,14 +6,17 @@ plugins {
     kotlin("native.cocoapods")
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.sqlDelight)
+    alias(libs.plugins.gradle.mavenpublish)
 }
 
 version = "0.1.0"
 
 kotlin {
 
-    jvmToolchain(17)
-    android()
+    jvmToolchain(11)
+    android {
+        publishAllLibraryVariants()
+    }
     val frameworkName = "FlakerDataModule"
     val xcFramework = XCFramework(frameworkName)
 
@@ -110,8 +113,23 @@ android {
     defaultConfig {
         minSdk = 24
         targetSdk = 33
+        consumerProguardFiles("consumer-rules.pro")
     }
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+
+    buildTypes {
+        debug {
+            isMinifyEnabled = false
+        }
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
 }
 
 sqldelight {

diff --git a/flaker-data/consumer-rules.pro b/flaker-data/consumer-rules.pro
@@ -0,0 +1 @@
+-keep class androidx.datastore.*.** {*;}
diff --git a/flaker-data/gradle.properties b/flaker-data/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=io.rotlabs
+POM_ARTIFACT_ID=flaker-data
+VERSION_NAME=0.1.0
diff --git a/flaker-data/proguard-rules.pro b/flaker-data/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/flaker-data/src/androidUnitTest/kotlin/io/rotlabs/flakerprefs/TestDataStore.kt b/flaker-data/src/androidUnitTest/kotlin/io/rotlabs/flakerprefs/TestDataStore.kt
@@ -0,0 +1,8 @@
+package io.rotlabs.flakerprefs
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+
+internal actual fun testDataStore() : DataStore<Preferences> {
+    return createDataStore { DATASTORE_FILE_NAME }
+}
diff --git a/...r-data/src/commonTest/kotlin/io/rotlabs/flakerdb/networkrequest/NetworkRequestRepoTest.kt b/...r-data/src/commonTest/kotlin/io/rotlabs/flakerdb/networkrequest/NetworkRequestRepoTest.kt
@@ -110,11 +110,11 @@ class NetworkRequestRepoTest {
             host = "https://jsonplaceholder.typicode.com",
             path = "/todos/1",
             method = "GET",
-            requestTime = now - (millisInOneDay * 7),
+            requestTime = now - (millisInOneDay * 8),
             responseCode = 200,
             responseTimeTaken = 100,
             isFailedByFlaker = false,
-            createdAt = now - (millisInOneDay * 7)
+            createdAt = now - (millisInOneDay * 8)
         )
         networkRequestRepo.insert(networkRequest1)
         assertEquals(2, networkRequestRepo.selectAll().size)
@@ -126,11 +126,11 @@ class NetworkRequestRepoTest {
             host = "https://jsonplaceholder.typicode.com",
             path = "/todos/1",
             method = "GET",
-            requestTime = now - (millisInOneDay * 15),
+            requestTime = now - (millisInOneDay * 16),
             responseCode = 200,
             responseTimeTaken = 100,
             isFailedByFlaker = false,
-            createdAt = now - (millisInOneDay * 15)
+            createdAt = now - (millisInOneDay * 16)
         )
         networkRequestRepo.insert(networkRequest2)
         assertEquals(2, networkRequestRepo.selectAll().size)
@@ -142,11 +142,11 @@ class NetworkRequestRepoTest {
             host = "https://jsonplaceholder.typicode.com",
             path = "/todos/1",
             method = "GET",
-            requestTime = now - (millisInOneDay * 30),
+            requestTime = now - (millisInOneDay * 31),
             responseCode = 200,
             responseTimeTaken = 100,
             isFailedByFlaker = false,
-            createdAt = now - (millisInOneDay * 30)
+            createdAt = now - (millisInOneDay * 31)
         )
         networkRequestRepo.insert(networkRequest3)
         assertEquals(2, networkRequestRepo.selectAll().size)