diff --git a/.github/workflows/deploy-android-to-play-store.yml b/.github/workflows/deploy-android-to-play-store.yml index cfdd1c0752..7e79b1ceba 100644 --- a/.github/workflows/deploy-android-to-play-store.yml +++ b/.github/workflows/deploy-android-to-play-store.yml @@ -15,7 +15,7 @@ jobs: if: inputs.android == true defaults: run: - working-directory: mobile + working-directory: mobile-v3 steps: - name: Checkout uses: "actions/checkout@v4" @@ -64,8 +64,8 @@ jobs: - name: Setup Fastlane uses: ruby/setup-ruby@v1.123.0 with: - ruby-version: "2.6" - working-directory: mobile/android + ruby-version: "3.1.0" + working-directory: mobile-v3/android - name: Install bundle run: | @@ -78,6 +78,13 @@ jobs: cd android/ echo $MOBILE_ANDROID_PLAYSTORE_SA > play-store-service-account.json bundle exec fastlane supply init + mkdir -p fastlane/metadata/android/en-US/changelogs + touch fastlane/metadata/android/en-US/changelogs/default.txt + + if [ ! -f fastlane/release_notes.txt ]; then + echo "App release version 3.0.2" > fastlane/release_notes.txt + fi + cat fastlane/release_notes.txt > fastlane/metadata/android/en-US/changelogs/default.txt bundle exec fastlane android play_store env: diff --git a/mobile-v3/.gitignore b/mobile-v3/.gitignore index af9ab63cf1..aca42503cb 100644 --- a/mobile-v3/.gitignore +++ b/mobile-v3/.gitignore @@ -70,3 +70,7 @@ app.*.map.json .env .env.* *.env + +/android/google-services.json +/android/play-store-service-account.json +/android/fastlane/metadata \ No newline at end of file diff --git a/mobile-v3/android/Gemfile b/mobile-v3/android/Gemfile new file mode 100644 index 0000000000..cdd3a6b349 --- /dev/null +++ b/mobile-v3/android/Gemfile @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +gem "fastlane" + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/mobile-v3/android/Gemfile.lock b/mobile-v3/android/Gemfile.lock new file mode 100644 index 0000000000..62dbf8f284 --- /dev/null +++ b/mobile-v3/android/Gemfile.lock @@ -0,0 +1,229 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.1022.0) + aws-sdk-core (3.214.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.176.1) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.226.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.4.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-firebase_app_distribution (0.9.1) + google-apis-firebaseappdistribution_v1 (~> 0.3.0) + google-apis-firebaseappdistribution_v1alpha (~> 0.2.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-firebaseappdistribution_v1 (0.3.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-firebaseappdistribution_v1alpha (0.2.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.8) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.9.0) + jwt (2.9.3) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.4.0) + naturally (2.2.1) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.1) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.3.9) + rouge (3.28.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) + xcodeproj (1.27.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + x64-mingw-ucrt + +DEPENDENCIES + fastlane + fastlane-plugin-firebase_app_distribution + +BUNDLED WITH + 2.5.22 diff --git a/mobile-v3/android/app/build.gradle b/mobile-v3/android/app/build.gradle index 57712a99df..ddabf76c1d 100644 --- a/mobile-v3/android/app/build.gradle +++ b/mobile-v3/android/app/build.gradle @@ -22,6 +22,15 @@ secrets { ignoreList.add("sdk.*") // Ignore all keys matching the regexp "sdk.*" } + +def appProperties = new Properties() +def appPropertiesFile = rootProject.file('key.properties') +if (appPropertiesFile.exists()) { + appPropertiesFile.withReader('UTF-8') { reader -> + appProperties.load(reader) + } +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -30,6 +39,16 @@ if (localPropertiesFile.exists()) { } } +def googleMapApiKey = appProperties.getProperty('google.maps.key') +if (googleMapApiKey == null) { + throw new GradleException("Google Maps Key not found. Define google.maps.key in the key.properties file.") +} + +def googleMapApiKeyDev = appProperties.getProperty('google.maps.key.dev') +if (googleMapApiKeyDev == null) { + throw new GradleException("Google Maps Key not found. Define google.maps.key_dev in the key.properties file.") +} + def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -40,6 +59,12 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } +def releaseKeystoreProperties = new Properties() +def releaseKeystorePropertiesFile = rootProject.file('prod-key.properties') +if (releaseKeystorePropertiesFile.exists()) { + releaseKeystoreProperties.load(new FileInputStream(releaseKeystorePropertiesFile)) +} + android { namespace "com.airqo.app" compileSdk 34 @@ -69,11 +94,35 @@ android { versionName flutterVersionName } + flavorDimensions "airqo" + productFlavors { + airqo { + dimension "airqo" + manifestPlaceholders = [googleMapsKey:googleMapApiKey] + } + + airqodev { + dimension "airqo" + applicationIdSuffix ".dev" + manifestPlaceholders = [googleMapsKey:googleMapApiKeyDev] + } + + } + + signingConfigs { + release { + keyAlias releaseKeystoreProperties['keyAlias'] + keyPassword releaseKeystoreProperties['keyPassword'] + storeFile releaseKeystoreProperties['storeFile'] ? file(releaseKeystoreProperties['storeFile']) : null + storePassword releaseKeystoreProperties['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 } } } diff --git a/mobile-v3/android/fastlane/Appfile b/mobile-v3/android/fastlane/Appfile new file mode 100644 index 0000000000..22334024c4 --- /dev/null +++ b/mobile-v3/android/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("play-store-service-account.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("com.airqo.app") # e.g. com.krausefx.app diff --git a/mobile-v3/android/fastlane/Fastfile b/mobile-v3/android/fastlane/Fastfile new file mode 100644 index 0000000000..78cec40eed --- /dev/null +++ b/mobile-v3/android/fastlane/Fastfile @@ -0,0 +1,43 @@ + +default_platform(:android) + +platform :android do + + desc "Deploy a new version to play store" + lane :play_store do + update_fastlane + sh "bundle exec fastlane update_plugins" + _google_play_track_version_codes = google_play_track_version_codes( + package_name: 'com.airqo.app', + track: 'production', + json_key_data: ENV['MOBILE_ANDROID_PLAYSTORE_SA'] + ) + _previous_build_number = _google_play_track_version_codes[0] + _new_build_number = _previous_build_number + 1 + sh "flutter build appbundle --build-number #{_new_build_number} --flavor airqo" + upload_to_play_store( + release_status: "completed", + json_key_data: ENV['MOBILE_ANDROID_PLAYSTORE_SA'], + package_name:"com.airqo.app", + aab: "../build/app/outputs/bundle/airqoRelease/app-airqo-release.aab", + skip_upload_metadata: true, + skip_upload_images: true, + skip_upload_screenshots: true, + ) + end + + desc "Deploy to new version to Firebase App Distribution" + lane :app_distribution do + update_fastlane + sh "bundle exec fastlane update_plugins" + sh "flutter build appbundle --flavor airqo" + firebase_app_distribution( + app: ENV['MOBILE_ANDROID_ID_FIREBASE'], + android_artifact_path:"../build/app/outputs/bundle/airqoRelease/app-airqo-release.aab", + release_notes_file: "fastlane/release_notes.txt", + service_credentials_file: "fastlane/firebase-app-distribution.json", + android_artifact_type: "AAB", + groups: "airqo-team", + ) + end +end \ No newline at end of file diff --git a/mobile-v3/android/fastlane/Pluginfile b/mobile-v3/android/fastlane/Pluginfile new file mode 100644 index 0000000000..d1ef63eddd --- /dev/null +++ b/mobile-v3/android/fastlane/Pluginfile @@ -0,0 +1 @@ +gem 'fastlane-plugin-firebase_app_distribution' \ No newline at end of file diff --git a/mobile-v3/android/fastlane/README.md b/mobile-v3/android/fastlane/README.md new file mode 100644 index 0000000000..7f9f36193e --- /dev/null +++ b/mobile-v3/android/fastlane/README.md @@ -0,0 +1,40 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## Android + +### android play_store + +```sh +[bundle exec] fastlane android play_store +``` + +Deploy a new version to play store + +### android app_distribution + +```sh +[bundle exec] fastlane android app_distribution +``` + +Deploy to new version to Firebase App Distribution + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/mobile-v3/android/fastlane/report.xml b/mobile-v3/android/fastlane/report.xml new file mode 100644 index 0000000000..14cdb7907c --- /dev/null +++ b/mobile-v3/android/fastlane/report.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/mobile-v3/pubspec.lock b/mobile-v3/pubspec.lock index ea03c35d01..ad601315bd 100644 --- a/mobile-v3/pubspec.lock +++ b/mobile-v3/pubspec.lock @@ -162,10 +162,10 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3" + sha256: e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.1.1" connectivity_plus_platform_interface: dependency: transitive description: @@ -319,10 +319,10 @@ packages: dependency: "direct main" description: name: flutter_sticky_header - sha256: "017f398fbb45a589e01491861ca20eb6570a763fd9f3888165a978e11248c709" + sha256: "7f76d24d119424ca0c95c146b8627a457e8de8169b0d584f766c2c545db8f8be" url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.7.0" flutter_svg: dependency: "direct main" description: @@ -473,10 +473,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: @@ -617,10 +617,10 @@ packages: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" path: dependency: transitive description: @@ -649,18 +649,18 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7" + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" url: "https://pub.dev" source: hosted - version: "2.2.14" + version: "2.2.15" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -729,10 +729,10 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pubspec_parse: dependency: transitive description: @@ -862,10 +862,10 @@ packages: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" typed_data: dependency: transitive description: @@ -878,10 +878,10 @@ packages: dependency: transitive description: name: value_layout_builder - sha256: "98202ec1807e94ac72725b7f0d15027afde513c55c69ff3f41bcfccb950831bc" + sha256: c02511ea91ca5c643b514a33a38fa52536f74aa939ec367d02938b5ede6807fa url: "https://pub.dev" source: hosted - version: "0.3.1" + version: "0.4.0" vector_graphics: dependency: transitive description: diff --git a/mobile-v3/pubspec.yaml b/mobile-v3/pubspec.yaml index 06f08d0ac1..876656b005 100644 --- a/mobile-v3/pubspec.yaml +++ b/mobile-v3/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: hive_flutter: ^1.1.0 modal_bottom_sheet: ^3.0.0 shimmer: ^3.0.0 - flutter_sticky_header: ^0.6.5 + flutter_sticky_header: ^0.7.0 flutter_dotenv: ^5.1.0 intl: ^0.19.0 google_maps_flutter: ^2.7.1 @@ -89,7 +89,8 @@ flutter: - assets/data/data.json - assets/data/new_data.json - assets/images/shared/airquality_indicators/ - - .env + - .env.prod + - .env.dev # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see