diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecb791b59..344aeeda2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -301,25 +301,3 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - build-android-remote: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - uses: subosito/flutter-action@v2 - with: - channel: stable - flutter-version-file: "crates/ui/pubspec.yaml" - - name: Generate FFI bindings - run: make generate_bindings - working-directory: crates/ui - - name: Build - run: flutter build apk -t lib/mobile/main.dart - working-directory: crates/ui - - uses: actions/upload-artifact@v4 - with: - name: android-remote - path: crates/ui/build/app/outputs/flutter-apk/app-release.apk - if-no-files-found: error diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml new file mode 100644 index 000000000..2a2d396c8 --- /dev/null +++ b/.github/workflows/mobile.yml @@ -0,0 +1,51 @@ +--- +on: + push: + branches: [main, feature/android-release-pipeline] + paths: + - "crates/ui/android/**" + - "crates/ui/lib/mobile/**" + - "crates/ui/pubspec.yaml" + - "crates/ui/pubspec.lock" + +jobs: + build-android-remote: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: subosito/flutter-action@v2 + with: + channel: stable + flutter-version-file: "crates/ui/pubspec.yaml" + - name: Set up ruby env + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7.2 + bundler-cache: true + - name: Create keystore + run: echo ${{ secrets.ANDROID_KEYSTORE }} | base64 -d > keystore.jks + working-directory: crates/ui + - name: Create properties file + env: + ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} + ANDROID_SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }} + ANDROID_SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }} + run: | + echo "storePassword=$ANDROID_KEYSTORE_PASSWORD" > key.properties + echo "keyPassword=$ANDROID_SIGNING_KEY_PASSWORD" >> key.properties + echo "keyAlias=$ANDROID_SIGNING_KEY_ALIAS" >> key.properties + echo "storeFile=keystore.jks" >> key.properties + working-directory: crates/ui + - name: Build + run: make android_bundle + working-directory: crates/ui + - name: Create service account file + env: + SERVICE_ACCOUNT_KEY_JSON: ${{ secrets.SERVICE_ACCOUNT_KEY_JSON }} + run: echo $SERVICE_ACCOUNT_KEY_JSON | base64 -d > service_account_key.json + working-directory: crates/ui/android + - name: Deploy + run: bundle exec fastlane internal + working-directory: crates/ui/android diff --git a/crates/ui/Makefile b/crates/ui/Makefile index ba60555a2..4b85c28cd 100644 --- a/crates/ui/Makefile +++ b/crates/ui/Makefile @@ -49,3 +49,6 @@ icons: companion: flutter run -t lib/mobile/main.dart + +android_bundle: generate_bindings + flutter build appbundle --release -t lib/mobile/main.dart diff --git a/crates/ui/android/.gitignore b/crates/ui/android/.gitignore index 0a741cb43..bfe558a11 100644 --- a/crates/ui/android/.gitignore +++ b/crates/ui/android/.gitignore @@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app key.properties +service_account_key.json diff --git a/crates/ui/android/Gemfile b/crates/ui/android/Gemfile new file mode 100644 index 000000000..ce9eae3ae --- /dev/null +++ b/crates/ui/android/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem 'fastlane-plugin-flutter_version', '~> 1.0', '>= 1.0.1' +gem "fastlane" diff --git a/crates/ui/android/Gemfile.lock b/crates/ui/android/Gemfile.lock new file mode 100644 index 000000000..1594ac103 --- /dev/null +++ b/crates/ui/android/Gemfile.lock @@ -0,0 +1,224 @@ +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.1003.0) + aws-sdk-core (3.212.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.95.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.170.0) + 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.225.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.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-flutter_version (1.1.15) + 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-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.7) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.8.1) + 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 (2.0.7) + 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.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + fastlane + fastlane-plugin-flutter_version (~> 1.0, >= 1.0.1) + +BUNDLED WITH + 2.5.23 diff --git a/crates/ui/android/app/build.gradle b/crates/ui/android/app/build.gradle index 47d10c153..632ef98e6 100644 --- a/crates/ui/android/app/build.gradle +++ b/crates/ui/android/app/build.gradle @@ -21,6 +21,12 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file("key.properties") +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" @@ -35,16 +41,23 @@ android { defaultConfig { applicationId "me.maxjoehnk.mizer" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } + signingConfigs { + release { + 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 } } } diff --git a/crates/ui/android/app/src/debug/AndroidManifest.xml b/crates/ui/android/app/src/debug/AndroidManifest.xml index c39370bad..a09ee751f 100644 --- a/crates/ui/android/app/src/debug/AndroidManifest.xml +++ b/crates/ui/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="me.maxjoehnk.mizer"> diff --git a/crates/ui/android/app/src/main/AndroidManifest.xml b/crates/ui/android/app/src/main/AndroidManifest.xml index 1496ea9a7..aef13071c 100644 --- a/crates/ui/android/app/src/main/AndroidManifest.xml +++ b/crates/ui/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="me.maxjoehnk.mizer"> + + diff --git a/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/ui/MainActivity.kt b/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/mizer/MainActivity.kt similarity index 78% rename from crates/ui/android/app/src/main/kotlin/me/maxjoehnk/ui/MainActivity.kt rename to crates/ui/android/app/src/main/kotlin/me/maxjoehnk/mizer/MainActivity.kt index fae096725..9964cb220 100644 --- a/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/ui/MainActivity.kt +++ b/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/mizer/MainActivity.kt @@ -1,4 +1,4 @@ -package me.maxjoehnk.ui +package me.maxjoehnk.mizer import io.flutter.embedding.android.FlutterActivity diff --git a/crates/ui/android/app/src/profile/AndroidManifest.xml b/crates/ui/android/app/src/profile/AndroidManifest.xml index c39370bad..a09ee751f 100644 --- a/crates/ui/android/app/src/profile/AndroidManifest.xml +++ b/crates/ui/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="me.maxjoehnk.mizer"> diff --git a/crates/ui/android/fastlane/Appfile b/crates/ui/android/fastlane/Appfile new file mode 100644 index 000000000..d43bf3625 --- /dev/null +++ b/crates/ui/android/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("service_account_key.json") +package_name("me.maxjoehnk.mizer") diff --git a/crates/ui/android/fastlane/Fastfile b/crates/ui/android/fastlane/Fastfile new file mode 100644 index 000000000..7897e6dd3 --- /dev/null +++ b/crates/ui/android/fastlane/Fastfile @@ -0,0 +1,21 @@ +default_platform(:android) + +platform :android do + desc "Submit a new Beta Build to Crashlytics Beta" + + lane :build do + gradle(task: "clean") + gradle(task: "bundle", build_type: "Release") + end + + lane :internal do + build + + upload_to_play_store( + track: 'internal', + version_code: flutter_version()['version_code'], + aab: '../build/app/outputs/bundle/release/app-release.aab', + skip_upload_apk: true + ) + end +end diff --git a/crates/ui/android/fastlane/README.md b/crates/ui/android/fastlane/README.md new file mode 100644 index 000000000..cb5d75f4a --- /dev/null +++ b/crates/ui/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 build + +```sh +[bundle exec] fastlane android build +``` + +Submit a new Beta Build to Crashlytics Beta + +### android internal + +```sh +[bundle exec] fastlane android internal +``` + + + +---- + +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/crates/ui/android/fastlane/metadata/android/en-US/full_description.txt b/crates/ui/android/fastlane/metadata/android/en-US/full_description.txt new file mode 100644 index 000000000..11cd39c70 --- /dev/null +++ b/crates/ui/android/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1 @@ +Remote Client for Mizer \ No newline at end of file diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/featureGraphic.png b/crates/ui/android/fastlane/metadata/android/en-US/images/featureGraphic.png new file mode 100644 index 000000000..6acc40437 Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/icon.png b/crates/ui/android/fastlane/metadata/android/en-US/images/icon.png new file mode 100644 index 000000000..a1140709a Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png new file mode 100644 index 000000000..6bfa9a49f Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png new file mode 100644 index 000000000..2703cde08 Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/short_description.txt b/crates/ui/android/fastlane/metadata/android/en-US/short_description.txt new file mode 100644 index 000000000..11cd39c70 --- /dev/null +++ b/crates/ui/android/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +Remote Client for Mizer \ No newline at end of file diff --git a/crates/ui/android/fastlane/metadata/android/en-US/title.txt b/crates/ui/android/fastlane/metadata/android/en-US/title.txt new file mode 100644 index 000000000..5ea5880a0 --- /dev/null +++ b/crates/ui/android/fastlane/metadata/android/en-US/title.txt @@ -0,0 +1 @@ +Mizer \ No newline at end of file diff --git a/crates/ui/android/fastlane/metadata/android/en-US/video.txt b/crates/ui/android/fastlane/metadata/android/en-US/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/crates/ui/pubspec.yaml b/crates/ui/pubspec.yaml index eb348e026..39208fc55 100644 --- a/crates/ui/pubspec.yaml +++ b/crates/ui/pubspec.yaml @@ -1,7 +1,7 @@ name: mizer description: UI for Mizer publish_to: 'none' -version: 1.0.0+1 +version: 1.0.0+4 environment: sdk: ">=3.3.0 <4.0.0"