diff --git a/.github/workflows/deploy_to_playstore.yml b/.github/workflows/deploy_to_playstore.yml new file mode 100644 index 0000000..b71b882 --- /dev/null +++ b/.github/workflows/deploy_to_playstore.yml @@ -0,0 +1,53 @@ +name: Deploy to Play Store Internal + +on: + workflow_dispatch: + inputs: + skipBuildNumberIncrease: + description: 'Skip automatic build number increase' + type: boolean + default: false + +jobs: + android-publish-to-play-store: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Ruby & Fastlane + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.2.1' + bundler-cache: true + working-directory: ./android + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'adopt' + java-version: '11' + # caching currently disabled, because the files are large, but don't decrease built time too much + #cache: gradle + + - name: Restore Release Keystore + env: + keystore_base64: ${{ secrets.BROQROLI_ANDROID_KEYSTORE_BASE64 }} + run: | + echo "$keystore_base64" | base64 --decode > release.keystore + echo "BROQROLI_KEYSTORE=`pwd`/release.keystore" >> $GITHUB_ENV + - name: Restore PlayStore Service Account + env: + play_store_service_account_json: ${{ secrets.BROQROLI_ANDROID_PLAY_STORE_AUTH_JSON }} + run: | + echo "$play_store_service_account_base64" > play-store-distribution-service-account.json + echo "BROQROLI_ANDROID_PLAY_STORE_AUTH_FILE=`pwd`/play-store-distribution-service-account.json" >> $GITHUB_ENV + + - name: Deploy to Play Store Internal Track + env: + BROQROLI_KEY: ${{ secrets.BROQROLI_ANDROID_KEYSTORE_KEY_ALIAS }} + BROQROLI_PASS: ${{ secrets.BROQROLI_ANDROID_KEYSTORE_KEY_PASSWORD }} + BROQROLI_KEY_PASS: ${{ secrets.BROQROLI_ANDROID_KEYSTORE_STORE_PASSWORD }} + working-directory: ./android + run: bundle exec fastlane deployProdToPlayStore skip_build_number_increase:${{ github.event.inputs.skipBuildNumberIncrease }} \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..cdd3a6b --- /dev/null +++ b/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/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..d8f1b55 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,225 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.6) + rexml + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.2.0) + aws-partitions (1.815.0) + aws-sdk-core (3.181.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.71.0) + aws-sdk-core (~> 3, >= 3.177.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.134.0) + aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) + 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.5) + 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.102.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.7) + fastlane (2.214.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, < 3.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) + fastlane-plugin-firebase_app_distribution (0.7.2) + google-apis-firebaseappdistribution_v1 (~> 0.3.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.49.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.1) + 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-firebaseappdistribution_v1 (0.3.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.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.1) + 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.7.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.1) + memoist (0.16.2) + mini_magick (4.12.0) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.3.0) + nanaimo (0.3.0) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) + plist (3.7.0) + public_suffix (5.0.3) + 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.6) + 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) + 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 + arm64-darwin-21 + arm64-darwin-22 + x86_64-linux + +DEPENDENCIES + fastlane + fastlane-plugin-firebase_app_distribution + +BUNDLED WITH + 2.4.10 diff --git a/app/build.gradle b/app/build.gradle index 17785dd..590fe2c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,16 +2,20 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' } +// custom properties +def applicationIdArgument = project.findProperty('applicationId') +def applicationVersionCodeArgument = project.findProperty('versionCode')?.isInteger() ? project.findProperty('versionCode')?.toInteger() : null +def useDebugSigningForReleaseBuild = project.findProperty('useDebugSigningForReleaseBuild')?.toBoolean() ?: false android { namespace 'org.fnives.android.qrcodetransfer' compileSdk 34 defaultConfig { - applicationId "org.fnives.android.qrcodetransfer" + applicationId applicationIdArgument ?: "org.fnives.android.qrcodetransfer" minSdk 26 targetSdk 34 - versionCode 1 + versionCode applicationVersionCodeArgument ?: 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -20,9 +24,29 @@ android { } } + signingConfigs { + debug { + storeFile file('debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + release { + storeFile file(System.getenv("BROQROLI_KEYSTORE") ?: 'debug.keystore') + keyAlias System.getenv("BROQROLI_KEY") ?: '' + keyPassword System.getenv("BROQROLI_KEY_PASS") ?: '' + storePassword System.getenv("BROQROLI_PASS") ?: '' + } + } + buildTypes { release { - minifyEnabled false + if (useDebugSigningForReleaseBuild) { + signingConfig signingConfigs.debug + } else { + signingConfig signingConfigs.release + } + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/app/debug.keystore b/app/debug.keystore new file mode 100644 index 0000000..364e105 Binary files /dev/null and b/app/debug.keystore differ diff --git a/fastlane/AppFile b/fastlane/AppFile new file mode 100644 index 0000000..142dbd6 --- /dev/null +++ b/fastlane/AppFile @@ -0,0 +1,2 @@ +json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("org.fnives.android.qrcodetransfer") diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..8ebfed3 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,68 @@ +# 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 + + before_all do + PROD_APP_IDENTIFIER = "org.fnives.android.qrcodetransfer" + + # Environment variable should be the full path to the PlayStore auth .json + PLAY_STORE_AUTH_FILE = ENV['BROQROLI_ANDROID_PLAY_STORE_AUTH_FILE'] + end + + desc "Submit a new Production Build to Play Store" + desc "By Default it sets the version_code to last from PlayStore + 1." + desc ">Optionally version code increase can be skipped via:" + desc "```sh" + desc "[bundle exec] fastlane deployProdToPlayStore skip_build_number_increase:true" + desc "```" + lane :deployProdToPlayStore do |options| + skip_build_number_increase = options[:skip_build_number_increase] # optional, if not set, it gets the last from PlayStore then adds + 1 + package_name = PROD_APP_IDENTIFIER + + if skip_build_number_increase.nil? || !skip_build_number_increase + last_version_codes = google_play_track_version_codes( + track: 'internal', + json_key: PLAY_STORE_AUTH_FILE, + package_name: package_name + ) + last_version_code = last_version_codes[0] + version_code = last_version_code + 1 + end + + gradle(task: 'clean', flags: "--no-daemon") + gradle( + task: 'bundle', + build_type: 'release', + flags: "--no-daemon", + properties: { + "applicationId" => PROD_APP_IDENTIFIER, + "versionCode" => version_code + } + ) + production_aab = lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS].find{ |i| i[/app-*release*.aab/] } + + upload_to_play_store( + track: 'internal', + release_status: 'draft', # can remove once app is released to the public + aab: production_aab, + json_key: PLAY_STORE_AUTH_FILE, + skip_upload_apk: true, + package_name: package_name, + ) + end +end diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile new file mode 100644 index 0000000..b18539b --- /dev/null +++ b/fastlane/Pluginfile @@ -0,0 +1,5 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +gem 'fastlane-plugin-firebase_app_distribution' diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 0000000..7fd5f2f --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,42 @@ +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 deployProdToPlayStore + +```sh +[bundle exec] fastlane android deployProdToPlayStore +``` + +Submit a new Production Build to Play Store + +By Default it sets the version_code to last from PlayStore + 1. + +>Optionally version code increase can be skipped via: + +```sh + +[bundle exec] fastlane deployProdToPlayStore skip_build_number_increase:true + +``` + +---- + +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).