From b583d04e8fc005e1572418fcd64e379b663bde3d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 21 Oct 2024 14:14:03 -0500 Subject: [PATCH] Bundle wear app (#3074) --- .github/workflows/bundle.yml | 4 +++- .../java/org/tasks/analytics/Firebase.kt | 2 ++ fastlane/Fastfile | 2 +- wear/build.gradle.kts | 17 ++++++++++++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index 24e5dda27..76973042f 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -44,4 +44,6 @@ jobs: uses: actions/upload-artifact@v4 with: name: release - path: app/build/outputs/** + path: | + app/build/outputs/** + wear/build/outputs/** diff --git a/app/src/generic/java/org/tasks/analytics/Firebase.kt b/app/src/generic/java/org/tasks/analytics/Firebase.kt index 2ff354efa..d5d3de929 100644 --- a/app/src/generic/java/org/tasks/analytics/Firebase.kt +++ b/app/src/generic/java/org/tasks/analytics/Firebase.kt @@ -13,6 +13,8 @@ class Firebase @Inject constructor() { fun addTask(source: String) {} + fun completeTask(source: String) {} + val subscribeCooldown = false val moreOptionsBadge = false val moreOptionsSolid = false diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 0d684088b..7483acdaa 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -44,7 +44,7 @@ platform :android do desc "Bundle" lane :bundle do gradle( - task: "bundleGoogleplayRelease", + task: "app:bundleGoogleplayRelease wear:bundleRelease", properties: { "tasksKeyAlias": ENV["KEY_ALIAS"], "tasksStoreFile": ENV["KEY_PATH"], diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index dec38b3fd..3ace2f483 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -17,13 +17,28 @@ android { versionName = "1.0" } + signingConfigs { + create("release") { + val tasksKeyAlias: String? by project + val tasksStoreFile: String? by project + val tasksStorePassword: String? by project + val tasksKeyPassword: String? by project + + keyAlias = tasksKeyAlias + storeFile = file(tasksStoreFile ?: "none") + storePassword = tasksStorePassword + keyPassword = tasksKeyPassword + } + } + buildTypes { release { - isMinifyEnabled = false + isMinifyEnabled = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) + signingConfig = signingConfigs.getByName("release") } } compileOptions {