Skip to content

Commit bf3cb65

Browse files
authored
chore(dogfooding): dogfooding distribution workflow fix - android (#783)
* bumping flutter version * test branch change * test change * install java * test change 2 * android distribution fixes * added dogfooding version to login screen * tweak
1 parent 84ff74f commit bf3cb65

File tree

5 files changed

+38
-10
lines changed

5 files changed

+38
-10
lines changed

.github/workflows/app-distribute.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- dogfooding/**
99

1010
env:
11-
FLUTTER_VERSION: '3.19.5'
11+
FLUTTER_VERSION: '3.24.3'
1212
FLUTTER_CHANNEL: stable
1313
ENV_PROPERTIES: ${{ secrets.ENV_PROPERTIES }}
1414
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
@@ -75,6 +75,12 @@ jobs:
7575
- name: Checkout code
7676
uses: actions/checkout@v3
7777

78+
- name: ⚙️ Set up Java
79+
uses: actions/setup-java@v3
80+
with:
81+
distribution: "zulu"
82+
java-version: "17"
83+
7884
- name: Setup Flutter
7985
uses: subosito/flutter-action@v2
8086
with:

dogfooding/android/fastlane/Fastfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ platform :android do
3030
track: 'internal',
3131
aab: "../build/app/outputs/bundle/release/app-release.aab",
3232
skip_upload_screenshots: true,
33-
skip_upload_images: true,
34-
release_status: "draft"
33+
skip_upload_images: true
3534
)
3635
end
3736
end

dogfooding/lib/app/app.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
55
// 📦 Package imports:
66
import 'package:firebase_core/firebase_core.dart';
77
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
8+
import 'package:flutter_dogfooding/core/repos/token_service.dart';
89

910
// 🌎 Project imports:
1011
import 'package:flutter_dogfooding/di/injector.dart';
@@ -67,8 +68,12 @@ class _StreamDogFoodingAppState extends State<StreamDogFoodingApp> {
6768
return true;
6869
};
6970

70-
// Initialise injector
71-
await AppInjector.init();
71+
// Initialise injector, use demo env for production
72+
if (kDebugMode == true) {
73+
await AppInjector.init();
74+
} else {
75+
await AppInjector.init(forceEnvironment: Environment.demo);
76+
}
7277

7378
// Check if there are saved credentials. If there are, login with them.
7479
await _handleSavedLogin();

dogfooding/lib/screens/login_screen.dart

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import 'package:flutter_dogfooding/widgets/stream_button.dart';
1515
import 'package:flutter_svg/flutter_svg.dart';
1616
import 'package:google_sign_in/google_sign_in.dart';
1717
import 'package:stream_video_flutter/stream_video_flutter.dart';
18+
import 'package:package_info_plus/package_info_plus.dart';
1819

1920
// 🌎 Project imports:
2021
import '../di/injector.dart';
@@ -101,9 +102,10 @@ class _LoginScreenState extends State<LoginScreen> {
101102
appBar: AppBar(
102103
backgroundColor: AppColorPalette.backgroundColor,
103104
actions: [
104-
EnvironmentSwitcher(
105-
currentEnvironment: _appPreferences.environment,
106-
)
105+
if (kDebugMode)
106+
EnvironmentSwitcher(
107+
currentEnvironment: _appPreferences.environment,
108+
)
107109
],
108110
),
109111
body: SafeArea(
@@ -192,6 +194,21 @@ class _LoginScreenState extends State<LoginScreen> {
192194
label: 'Join As Guest',
193195
),
194196
),
197+
FutureBuilder<PackageInfo>(
198+
future: PackageInfo.fromPlatform(),
199+
builder: (context, snapshot) {
200+
if (!snapshot.hasData) return const SizedBox.shrink();
201+
final platformInfo = snapshot.data;
202+
203+
return Padding(
204+
padding: const EdgeInsets.all(16),
205+
child: Text(
206+
'Version ${platformInfo?.version}+${platformInfo?.buildNumber}',
207+
style: theme.textTheme.labelSmall,
208+
),
209+
);
210+
},
211+
),
195212
],
196213
),
197214
),

dogfooding/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: flutter_dogfooding
2-
version: 1.0.0+1
2+
version: 1.5.5+1
33
publish_to: none
44
description: Flutter Dogfooding App to showcase Video SDK.
55

@@ -8,6 +8,7 @@ environment:
88
flutter: ">=3.22.0"
99

1010
dependencies:
11+
app_links: ^6.3.2
1112
crypto: ^3.0.5
1213
cupertino_icons: ^1.0.8
1314
device_info_plus: ^10.1.2
@@ -25,6 +26,7 @@ dependencies:
2526
google_fonts: ^5.1.0
2627
google_sign_in: ^6.2.1
2728
http: ^1.2.2
29+
package_info_plus: ^8.1.0
2830
path_provider: ^2.1.4
2931
permission_handler: ^11.3.1
3032
rxdart: ^0.28.0
@@ -34,7 +36,6 @@ dependencies:
3436
stream_video_flutter: ^0.5.5
3537
stream_video_push_notification: ^0.5.5
3638
stream_video_screen_sharing: ^0.5.5
37-
app_links: ^6.3.2
3839

3940
dependency_overrides:
4041
archive: ^3.6.1

0 commit comments

Comments
 (0)