diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml index ca24e33b52..a048536b2f 100644 --- a/.github/workflows/build-mobile.yml +++ b/.github/workflows/build-mobile.yml @@ -122,17 +122,17 @@ jobs: IS_MAIN: ${{ github.ref == 'refs/heads/main' }} run: | if [[ $IS_MAIN == 'true' ]]; then - flutter build apk --release --flavor production - flutter build apk --release --flavor production --split-per-abi --target-platform android-arm,android-arm64,android-x64 + flutter build apk --release + flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64 else - flutter build apk --debug --flavor production --split-per-abi --target-platform android-arm64 + flutter build apk --debug --split-per-abi --target-platform android-arm64 fi - name: Publish Android Artifact uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: release-apk-signed - path: mobile/build/app/outputs/flutter-apk/**/*.apk + path: mobile/build/app/outputs/flutter-apk/*.apk - name: Save Gradle Cache id: cache-gradle-save diff --git a/.vscode/launch.json b/.vscode/launch.json index 8682376cda..ed3da9f667 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,25 +18,6 @@ "name": "Immich Workers", "remoteRoot": "/usr/src/app", "localRoot": "${workspaceFolder}/server" - }, - { - "name": "Flavor - Production", - "request": "launch", - "type": "dart", - "codeLens": { - "for": [ - "run-test", - "run-test-file", - "run-file", - "debug-test", - "debug-test-file", - "debug-file", - ], - "title": "${debugType}", - }, - "args": [ - "--flavor", "production" - ], } ] } diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 8b4dc42b7e..1f0e2e7675 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -72,20 +72,6 @@ android { } } - flavorDimensions "default" - productFlavors { - production { - dimension "default" - applicationId "app.alextran.immich" - } - - beta { - dimension "default" - applicationId "app.alextran.immich.beta" - versionNameSuffix "-BETA" - } - } - buildTypes { debug { applicationIdSuffix '.debug' diff --git a/mobile/android/app/src/beta/AndroidManifest.xml b/mobile/android/app/src/beta/AndroidManifest.xml deleted file mode 100644 index d4f7b5bc80..0000000000 --- a/mobile/android/app/src/beta/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/mobile/lib/widgets/common/immich_app_bar.dart b/mobile/lib/widgets/common/immich_app_bar.dart index 799cf17f3f..dbf088c112 100644 --- a/mobile/lib/widgets/common/immich_app_bar.dart +++ b/mobile/lib/widgets/common/immich_app_bar.dart @@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; @@ -186,7 +185,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget { child: action, ), ), - if (kDebugMode || kProfileMode || appFlavor == 'beta') + if (kDebugMode || kProfileMode) IconButton( icon: const Icon(Icons.science_rounded), onPressed: () => context.pushRoute(const FeatInDevRoute()), diff --git a/mobile/makefile b/mobile/makefile index 37d33fa817..fe259ca771 100644 --- a/mobile/makefile +++ b/mobile/makefile @@ -29,6 +29,3 @@ translation: dart run bin/generate_keys.dart dart format lib/generated/codegen_loader.g.dart dart format lib/generated/intl_keys.g.dart - -build-beta: - flutter build apk --flavor beta --release diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 19fff31d41..dcd078f65f 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -2,7 +2,7 @@ name: immich_mobile description: Immich - selfhosted backup media file on mobile phone publish_to: 'none' -version: 1.136.0+205 +version: 1.136.0+3000 environment: sdk: '>=3.3.0 <4.0.0'