diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ed2f71..ae97ca9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,12 +1,165 @@ version: 2.1 -jobs: - build: +orbs: + android: circleci/android@2.0.0 + macos: circleci/macos@2.0.1 + +parameters: + flutter_version: + type: string + default: "3.3.3" + xcode_version: + type: string + default: "13.3.0" + flutter_download_url: + type: string + default: "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_2.5.1-stable.zip" + +executors: + cirrusci: docker: - - image: cirrusci/flutter:3.3.3 + - image: cirrusci/flutter:<< pipeline.parameters.flutter_version >> + ios-flutter: + macos: + xcode: << pipeline.parameters.xcode_version >> + environment: + FL_OUTPUT_DIR: output + +commands: + flutter_project_setup: steps: - checkout - run: flutter doctor - run: flutter pub get - run: flutter pub run build_runner build - run: flutter analyze lib - - run: flutter test \ No newline at end of file + - run: flutter test + android_setup: + steps: + - run: + name: Keystore variables + command: | + echo "$GOOGLE_PLAY_KEY" > "android/playstore.json" + echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > "android/app/release_keystore.jks" + fastlane_setup_android: + steps: + - restore_cache: + key: 1-android-gems-{{ checksum "android/Gemfile.lock" }} + - run: + name: Configure Fastlane Android + command: | + gem install bundler + cd android + bundle check || bundle install + bundle update fastlane + - save_cache: + key: 1-android-gems-{{ checksum "android/Gemfile.lock" }} + paths: + - android/vendor/bundle + ios_setup: + steps: + - checkout + - restore_cache: + key: flutter-cache-<< pipeline.parameters.flutter_version >>-ios-bin + - run: + name: download flutter SDK + command: if ! test -d "flutter"; then curl -o flutter_sdk.zip << pipeline.parameters.flutter_download_url >>; fi + - run: + name: unzip flutter SDK + command: if test -f "flutter_sdk.zip"; then unzip flutter_sdk.zip; fi + - run: + name: export flutter path + command: echo 'export PATH="$PATH:`pwd`/flutter/bin"' >> $BASH_ENV + - save_cache: + key: flutter-cache-<< pipeline.parameters.flutter_version >>-ios-bin + paths: + - flutter + fastlane_setup_ios: + steps: + - restore_cache: + key: 1-ios-gems-{{ checksum "ios/Gemfile.lock" }} + - run: + name: Configure Fastlane iOS + command: | + gem install bundler:2.2.26 + cd ios + bundle check || bundle install + bundle update fastlane + - run: + name: Install Firebase CLI + command: | + curl -sL firebase.tools | bash + - save_cache: + key: 1-ios-gems-{{ checksum "ios/Gemfile.lock" }} + paths: + - ios/vendor/bundle +workflows: + version: 2 + all-branch: + jobs: + - build-all-branch: + filters: + branches: + ignore: master + distribute-android: + jobs: + - distribute-android: + filters: + branches: + only: master + distribute-ios: + jobs: + - distribute-ios: + filters: + branches: + only: ios_deployment +jobs: + build-all-branch: + docker: + - image: cirrusci/flutter:<< pipeline.parameters.flutter_version >> + steps: + - flutter_project_setup + distribute-android: + docker: + - image: cirrusci/flutter:<< pipeline.parameters.flutter_version >> + steps: + - flutter_project_setup + - android_setup + - fastlane_setup_android + - run: + name: Build Android APK + command: flutter build apk + - store_artifacts: + path: build/app/outputs/flutter-apk/app-release.apk + - run: + name: Upload to PlayStore + command: | + pwd + cd android + bundle exec fastlane supply --apk ../build/app/outputs/flutter-apk/app-release.apk --rollout 1 + distribute-ios: + executor: ios-flutter + steps: + - ios_setup + - fastlane_setup_ios + - run: + name: Production variables + command: | + echo "$ENV_PROD" | base64 --decode > ".env" + echo "$ENV_DEV" | base64 --decode > ".dev.env" + - run: + name: Build iOS Production App + command: | + flutter clean && flutter pub get && cd ios && rm Podfile.lock && pod install && cd .. + - run: + name: Replace ShareMe file + command: | + echo "$SwiftFlutterShareMePlugin" | base64 --decode > "/Users/distiller/project/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_share_me-1.2.0/ios/Classes/SwiftFlutterShareMePlugin.swift" + - run: + name: Build and Upload iOS Archive IPA + command: | + cd ios + bundle exec fastlane prod + - store_artifacts: + path: ios/output/gym/Runner.ipa + - store_artifacts: + path: ios/output/gym/Runner.app.dSYM.zip \ No newline at end of file diff --git a/android/.gitignore b/android/.gitignore index 6f56801..2d8610a 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -5,6 +5,7 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +/json # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app diff --git a/android/Gemfile b/android/Gemfile new file mode 100644 index 0000000..7a118b4 --- /dev/null +++ b/android/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" diff --git a/android/Gemfile.lock b/android/Gemfile.lock new file mode 100644 index 0000000..738adce --- /dev/null +++ b/android/Gemfile.lock @@ -0,0 +1,218 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.6) + rexml + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.2.0) + aws-partitions (1.711.0) + aws-sdk-core (3.170.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.62.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.119.1) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + 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.4) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.99.0) + faraday (1.10.3) + 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.1) + 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.0) + faraday (~> 1.0) + fastimage (2.2.6) + fastlane (2.211.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 + 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) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + 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.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.34.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-core (0.11.0) + 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 + webrick + google-apis-iamcredentials_v1 (0.16.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-playcustomapp_v1 (0.12.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.44.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) + memoist (0.16.2) + mini_magick (4.12.0) + mini_mime (1.1.2) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) + plist (3.6.0) + public_suffix (5.0.1) + rake (13.0.6) + 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.2.5) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.3) + signet (0.17.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 + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2-x64-mingw-ucrt) + unicode-display_width (1.8.0) + webrick (1.8.1) + word_wrap (1.0.0) + xcodeproj (1.22.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + x64-mingw-ucrt + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.3.26 diff --git a/android/app/build.gradle b/android/app/build.gradle index cee600c..ff6d688 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -21,10 +21,10 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -def relStorePassword = System.getenv("storePassword") -def relKeyPassword = System.getenv("keyPassword") -def relKeyAlias = System.getenv("keyAlias") -def relStoreFile = System.getenv("storeFile") +def relStorePassword = System.getenv("RELEASE_STORE_PASSWORD") +def relKeyPassword = System.getenv("RELEASE_KEY_PASSWORD") +def relKeyAlias = System.getenv("RELEASE_KEY_ALIAS") +def relStoreFile = System.getenv("RELEASE_KEYSTORE") apply plugin: 'com.android.application' apply plugin: 'kotlin-android' @@ -51,7 +51,7 @@ android { applicationId "com.appttude.h_mal.easycc" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion localProperties.getProperty('flutter.minSdkVersion').toInteger() + minSdkVersion 21 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/android/fastlane/Appfile b/android/fastlane/Appfile new file mode 100644 index 0000000..7fec904 --- /dev/null +++ b/android/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("playstore.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("com.appttude.h_mal.easycc") # e.g. com.krausefx.app diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile new file mode 100644 index 0000000..19c557c --- /dev/null +++ b/android/fastlane/Fastfile @@ -0,0 +1,38 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:android) + +platform :android do + desc "Runs all the tests" + lane :test do + gradle(task: "test") + end + + desc "Submit a new Beta Build to Crashlytics Beta" + lane :beta do + gradle(task: "clean assembleRelease") + crashlytics + + # sh "your_script.sh" + # You can also use other beta testing services here + end + + desc "Deploy a new version to the Google Play" + lane :deploy do + gradle(task: "clean assembleRelease") + upload_to_play_store + end +end diff --git a/android/fastlane/README.md b/android/fastlane/README.md new file mode 100644 index 0000000..7ec1207 --- /dev/null +++ b/android/fastlane/README.md @@ -0,0 +1,48 @@ +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 test + +```sh +[bundle exec] fastlane android test +``` + +Runs all the tests + +### android beta + +```sh +[bundle exec] fastlane android beta +``` + +Submit a new Beta Build to Crashlytics Beta + +### android deploy + +```sh +[bundle exec] fastlane android deploy +``` + +Deploy a new version to the Google Play + +---- + +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/android/fastlane/report.xml b/android/fastlane/report.xml new file mode 100644 index 0000000..ebbed0e --- /dev/null +++ b/android/fastlane/report.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/pubspec.yaml b/pubspec.yaml index c7e8276..bd1a60a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 6.1.1+8 +version: 6.1.2+9 environment: sdk: '>=2.18.0-190.0.dev <3.0.0'