Merge branch 'kmp'

.fvmrc

@@ -1,4 +1,4 @@
 {
-  "flutter": "3.7.12",
+  "flutter": "3.22.3",
   "flavors": {}
 }

.github/workflows/nightly.yml

@@ -18,6 +18,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.pub-cache
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.android/build-cache
+            ~/fvm
+          key: ${{ runner.os }}-pub-gradle-android-fvm-${{ hashFiles('**/pubspec.lock', '**/*.gradle', '**/pom.xml', '**/.fvmrc') }}
+          restore-keys: |
+            ${{ runner.os }}-pub-gradle-android-fvm-
+
       - uses: dart-lang/[email protected]
       - uses: actions/setup-java@v4
         with:
@@ -31,9 +43,9 @@ jobs:
       - run: fvm flutter pub get
       - run: fvm flutter analyze
         continue-on-error: true
-      - name: Flutter test
-        continue-on-error: true
-        run: fvm flutter test
+#      - name: Flutter test
+#        continue-on-error: true
+#        run: fvm flutter test
       - run: fvm flutter build apk --debug
         env:
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
@@ -44,9 +56,9 @@ jobs:
         with:
           name: debug-apk
           path: build/app/outputs/apk/debug/app-debug.apk
-      - name: Upload golden failures
-        uses: actions/upload-artifact@v4
-        with:
-          name: goldens-failures
-          path: test/components/failures/
-          if-no-files-found: 'ignore'
+#      - name: Upload golden failures
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: goldens-failures
+#          path: test/components/failures/
+#          if-no-files-found: 'ignore'

android/.gitignore

@@ -5,3 +5,6 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+/shared/.gradle
+buildSrc/build
+buildSrc/.gradle

android/app/build.gradle.kts

@@ -0,0 +1,159 @@
+import io.rebble.cobble.build.Repository
+import java.util.Properties
+
+plugins {
+    alias(libs.plugins.kapt)
+    alias(libs.plugins.serialization)
+    alias(libs.plugins.android.kotlin)
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.jetbrains.compose.compiler)
+}
+
+val localProperties = Properties()
+val localPropertiesFile = rootProject.file("local.properties")
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.reader().use { reader ->
+        localProperties.load(reader)
+    }
+}
+
+val flutterRoot = localProperties.getProperty("flutter.sdk")
+        ?: throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+
+val flutterVersionCode = localProperties.getProperty("flutter.versionCode") ?: "1"
+val flutterVersionName = localProperties.getProperty("flutter.versionName") ?: "1.0"
+//apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+apply(from = "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle")
+
+android {
+    if (System.getenv("ANDROID_NDK_HOME") != null) {
+        ndkPath = System.getenv("ANDROID_NDK_HOME")
+    }
+    compileSdk = 34
+
+    sourceSets {
+        getByName("main") {
+            java.srcDirs("src/main/kotlin")
+        }
+        getByName("androidTest") {
+            assets.srcDirs("src/androidTest/assets")
+            java.srcDirs("src/androidTest/kotlin")
+        }
+    }
+
+    defaultConfig {
+        applicationId = "io.rebble.cobble"
+        minSdk = 29
+        targetSdk = 34
+        versionCode = flutterVersionCode.toInt()
+        versionName = flutterVersionName
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
+        manifestPlaceholders["pebbleKitProviderAuthority"] = "io.rebble.cobble.provider"
+
+        buildConfigField("String", "COMMIT_HASH", "\"${Repository.getShortCommitHash()}\"")
+        buildConfigField("String", "BRANCH_NAME", "\"${Repository.getBranchName()}\"")
+    }
+
+    signingConfigs {
+        create("release") {
+            keyAlias = "upload"
+            keyPassword = System.getenv("ALIAS_PASSWORD")
+            storeFile = file("../key.jks")
+            storePassword = System.getenv("KEY_PASSWORD")
+        }
+        create("nightly") {
+            keyAlias = "key0"
+            keyPassword = System.getenv("ALIAS_PASSWORD")
+            storeFile = file("../key.jks")
+            storePassword = System.getenv("KEY_PASSWORD")
+        }
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", rootProject.file("shared/androidMain/proguard-rules.pro"))
+            signingConfig = signingConfigs.getByName("release")
+        }
+        getByName("debug") {
+            if (System.getenv("NIGHTLY") == "true") {
+                signingConfig = signingConfigs.getByName("nightly")
+            }
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = true
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    namespace = "io.rebble.cobble"
+//    lint {
+//        isCheckReleaseBuilds = false
+//        disable("InvalidPackage")
+//    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        freeCompilerArgs = listOf(
+                "-opt-in=kotlin.RequiresOptIn",
+                "-opt-in=kotlin.ExperimentalUnsignedTypes",
+                "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
+        )
+    }
+}
+
+project.extensions.getByName("flutter").apply {
+    this::class.java.getMethod("source", String::class.java).invoke(this, "../..")
+}
+
+val coroutinesVersion = "1.8.1"
+val lifecycleVersion = "2.8.2"
+val timberVersion = "5.0.1"
+val androidxCoreVersion = "1.13.1"
+val workManagerVersion = "2.9.0"
+val okioVersion = "3.9.0"
+
+val junitVersion = "4.13.2"
+val androidxTestVersion = "1.5.0"
+
+dependencies {
+    implementation(libs.androidx.appcompat)
+    api(libs.androidx.activity.compose)
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.libpebblecommon)
+    implementation(libs.kotlin.reflect)
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-service:$lifecycleVersion")
+    implementation("com.jakewharton.timber:timber:$timberVersion")
+    implementation("androidx.core:core-ktx:$androidxCoreVersion")
+    implementation(libs.androidx.work.runtime.ktx)
+    implementation("com.squareup.okio:okio:$okioVersion")
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.kotlinx.datetime)
+    implementation(libs.dagger)
+    implementation(libs.uuid)
+    implementation(libs.errorprone.annotations)
+    implementation(libs.spotbugs.annotations)
+    implementation(libs.compose.navigation)
+    implementation(project(":pebble_bt_transport"))
+    implementation(project(":shared"))
+    kapt(libs.dagger.compiler)
+
+    testImplementation("junit:junit:$junitVersion")
+    androidTestImplementation("androidx.test:runner:$androidxTestVersion")
+    androidTestImplementation("androidx.test:rules:$androidxTestVersion")
+}
+
+android.buildTypes.getByName("release").ndk.debugSymbolLevel = "FULL"

android/app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

android/app/src/androidTest/assets/print_test.js

@@ -0,0 +1,4 @@
+Pebble.addEventListener('ready', function() {
+  // PebbleKit JS is ready!
+  console.log('PebbleKit JS ready!');
+});