From ab3ba95c19588d4ae3cc95c8c24304488c54dff5 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Sat, 18 Nov 2023 22:42:20 -0500 Subject: [PATCH 01/12] First cut at updated gradle config for codemagic code signing --- android/app/build.gradle | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 6c91c85..cdcb0ad 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -18,7 +18,13 @@ if (flutterVersionCode == null) { def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = '0.8.0' +} + +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } apply plugin: 'com.android.application' @@ -53,11 +59,27 @@ android { versionName flutterVersionName } + signingConfigs { + release { + if (System.getenv()["CI"]) { // CI=true is exported by Codemagic + storeFile file(System.getenv()["CM_KEYSTORE_PATH"]) + storePassword System.getenv()["CM_KEYSTORE_PASSWORD"] + keyAlias System.getenv()["CM_KEY_ALIAS"] + keyPassword System.getenv()["CM_KEY_PASSWORD"] + } else { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + } + buildTypes { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release } } } From 2979f06e1c1cff4ae0a1910fcd4cfd04ad3ea1c2 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Mon, 27 Nov 2023 07:41:57 -0500 Subject: [PATCH 02/12] Bump version number --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index cdcb0ad..799e4fd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -13,7 +13,7 @@ if (flutterRoot == null) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = '2' } def flutterVersionName = localProperties.getProperty('flutter.versionName') From cde05afdb189659f09409f6cec5b9533f02613c4 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 15:03:34 -0500 Subject: [PATCH 03/12] Bump up versions in gradle --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 799e4fd..53178d0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -13,12 +13,12 @@ if (flutterRoot == null) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '2' + flutterVersionCode = '3' } def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '0.8.0' + flutterVersionName = '0.9.0' } def keystoreProperties = new Properties() From f1c0a51ac9adba4deea29f7bc43fd2cd0884e014 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 15:03:48 -0500 Subject: [PATCH 04/12] Bump up versions in gradle --- pubspec.lock | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index c93acf4..a5d46cb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" color_blindness: dependency: "direct main" description: @@ -705,10 +705,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -761,18 +761,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" media_kit: dependency: "direct main" description: @@ -849,10 +849,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -1239,10 +1239,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sprintf: dependency: transitive description: @@ -1279,18 +1279,18 @@ packages: dependency: "direct main" description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -1335,10 +1335,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" time_machine: dependency: "direct main" description: @@ -1555,6 +1555,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1612,5 +1620,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.10.0" From 3bfe635c6ca950bf7a71658fbdc05925ee7e64d3 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 16:16:50 -0500 Subject: [PATCH 05/12] Initial try of Android codemagic config --- codemagic.yaml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 codemagic.yaml diff --git a/codemagic.yaml b/codemagic.yaml new file mode 100644 index 0000000..909f98a --- /dev/null +++ b/codemagic.yaml @@ -0,0 +1,49 @@ +workflows: + android-workflow: + name: Android Workflow + instance_type: mac_mini_m1 + max_build_duration: 120 + environment: + android_signing: + - codemagickeystore + groups: + - google_play # <-- (Includes GCLOUD_SERVICE_ACCOUNT_CREDENTIALS) + vars: + PACKAGE_NAME: "relatica.myportal.social" # <-- Put your package name here + GOOGLE_PLAY_TRACK: "internal" + flutter: stable + scripts: + - name: Set up local.properties + script: | + echo "flutter.sdk=$HOME/programs/flutter" > "$CM_BUILD_DIR/android/local.properties" + - name: Get Flutter packages + script: | + flutter packages pub get + - name: Flutter analyze + script: | + flutter analyze + - name: Flutter unit tests + script: | + flutter test + ignore_failure: true + - name: Build AAB with Flutter + script: | + BUILD_NUMBER=$(($(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks="$GOOGLE_PLAY_TRACK") + 1)) + flutter build appbundle --release \ + --build-name=0.9.$BUILD_NUMBER \ + --build-number=$BUILD_NUMBER + artifacts: + - build/**/outputs/**/*.aab + - build/**/outputs/**/mapping.txt + - flutter_drive.log + publishing: + email: + recipients: + - codemagic@myportal.social + notify: + success: true + failure: false + google_play: + credentials: $GCLOUD_SERVICE_ACCOUNT_CREDENTIALS + track: $GOOGLE_PLAY_TRACK + submit_as_draft: true From 4644657c1cec77b480a1f867d186489b8bac205f Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 16:22:51 -0500 Subject: [PATCH 06/12] ignore flutter analyzie failure in codemagic flow --- codemagic.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/codemagic.yaml b/codemagic.yaml index 909f98a..ef0058c 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -22,6 +22,7 @@ workflows: - name: Flutter analyze script: | flutter analyze + ignore_failure: true - name: Flutter unit tests script: | flutter test From f30b577236b9b434448218b0fede7b62c56cca12 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 16:32:32 -0500 Subject: [PATCH 07/12] Use project build number --- codemagic.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codemagic.yaml b/codemagic.yaml index ef0058c..77e2b06 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -31,8 +31,8 @@ workflows: script: | BUILD_NUMBER=$(($(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks="$GOOGLE_PLAY_TRACK") + 1)) flutter build appbundle --release \ - --build-name=0.9.$BUILD_NUMBER \ - --build-number=$BUILD_NUMBER + --build-name=0.9.0 \ + --build-number=($PROJECT_BUILD_NUMBER) artifacts: - build/**/outputs/**/*.aab - build/**/outputs/**/mapping.txt From e190157b95587e82a56777d4b490c92a14c5cc2e Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 16:39:09 -0500 Subject: [PATCH 08/12] Ignore flutter analyze --- codemagic.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/codemagic.yaml b/codemagic.yaml index 77e2b06..9e6ff13 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -19,10 +19,10 @@ workflows: - name: Get Flutter packages script: | flutter packages pub get - - name: Flutter analyze - script: | - flutter analyze - ignore_failure: true + # - name: Flutter analyze + # script: | + # flutter analyze + # ignore_failure: true - name: Flutter unit tests script: | flutter test @@ -32,7 +32,7 @@ workflows: BUILD_NUMBER=$(($(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks="$GOOGLE_PLAY_TRACK") + 1)) flutter build appbundle --release \ --build-name=0.9.0 \ - --build-number=($PROJECT_BUILD_NUMBER) + --build-number=$PROJECT_BUILD_NUMBER artifacts: - build/**/outputs/**/*.aab - build/**/outputs/**/mapping.txt From b41d3b4fbf9dad381b280573767d50abaf673ef3 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 16:40:00 -0500 Subject: [PATCH 09/12] Go back to build number --- codemagic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemagic.yaml b/codemagic.yaml index 9e6ff13..f5958b8 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -32,7 +32,7 @@ workflows: BUILD_NUMBER=$(($(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks="$GOOGLE_PLAY_TRACK") + 1)) flutter build appbundle --release \ --build-name=0.9.0 \ - --build-number=$PROJECT_BUILD_NUMBER + --build-number=$BUILD_NUMBER artifacts: - build/**/outputs/**/*.aab - build/**/outputs/**/mapping.txt From cc72e58ea6993733d0a780e39588389e58730426 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 16:48:33 -0500 Subject: [PATCH 10/12] Add offset to build number --- codemagic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemagic.yaml b/codemagic.yaml index f5958b8..9b3019c 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -32,7 +32,7 @@ workflows: BUILD_NUMBER=$(($(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks="$GOOGLE_PLAY_TRACK") + 1)) flutter build appbundle --release \ --build-name=0.9.0 \ - --build-number=$BUILD_NUMBER + --build-number=($BUILD_NUMBER+4) artifacts: - build/**/outputs/**/*.aab - build/**/outputs/**/mapping.txt From d6b0c9813c053c9f289e0be5fede16862a40e3e2 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 16:56:32 -0500 Subject: [PATCH 11/12] Fix order of package name --- codemagic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemagic.yaml b/codemagic.yaml index 9b3019c..0906810 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -9,7 +9,7 @@ workflows: groups: - google_play # <-- (Includes GCLOUD_SERVICE_ACCOUNT_CREDENTIALS) vars: - PACKAGE_NAME: "relatica.myportal.social" # <-- Put your package name here + PACKAGE_NAME: "social.myportal.relatica" # <-- Put your package name here GOOGLE_PLAY_TRACK: "internal" flutter: stable scripts: From 8ddcab02b11f8a97af5fd0249356ded5827f2658 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 30 Nov 2023 17:06:38 -0500 Subject: [PATCH 12/12] Back to project build number --- codemagic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemagic.yaml b/codemagic.yaml index 0906810..6c9b267 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -32,7 +32,7 @@ workflows: BUILD_NUMBER=$(($(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks="$GOOGLE_PLAY_TRACK") + 1)) flutter build appbundle --release \ --build-name=0.9.0 \ - --build-number=($BUILD_NUMBER+4) + --build-number=$PROJECT_BUILD_NUMBER artifacts: - build/**/outputs/**/*.aab - build/**/outputs/**/mapping.txt