Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: upgrade flutter, xcode version #1534

Merged
merged 9 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android-release-appcenter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
java-version: "17"
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.13.6"
flutter-version: "3.19.0"
channel: stable
- name: Set env
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bmvn_build_appcenter_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
java-version: "17"
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.13.0"
flutter-version: "3.19.0"
channel: stable
- name: Set env
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bmvn_build_appcenter_ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.13.0"
flutter-version: "3.19.0"
channel: stable
# - uses: maxim-lobanov/setup-xcode@v1
# with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ios-release-appcenter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ on:

jobs:
fastlane-deploy:
runs-on: macOS-12
runs-on: macOS-13
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.13.0"
flutter-version: "3.19.0"
channel: stable
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: "14.0"
xcode-version: "15.2"

- name: Set env
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ios-release-testflight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ on:

jobs:
fastlane-deploy:
runs-on: macOS-12
runs-on: macOS-13
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.13.0"
flutter-version: "3.19.0"
channel: stable
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: "14.2"
xcode-version: "15.2"

- name: Set env
run: |
Expand Down
22 changes: 9 additions & 13 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ buildscript {
maven { url 'https://plugins.gradle.org/m2/' } // Gradle Plugin Portal
google() // Google's Maven repository
}
ext.kotlin_version = '1.7.20'
dependencies {
// ...
// OneSignal-Gradle-Plugin
Expand All @@ -12,6 +13,14 @@ buildscript {
}
}

plugins {
id "com.android.application"
id "kotlin-android"
id "kotlinx-serialization"
id "com.google.gms.google-services"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -20,11 +29,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def environment = System.getenv()

def flutterVersionCode = environment["FLUTTER_VERSION_CODE"]
Expand Down Expand Up @@ -59,14 +63,6 @@ if (branchKeyTest == null) {

def branchTestMode = localProperties["branch.testMode"] ?: environment["BRANCH_IS_TEST"] ?: false

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlinx-serialization'
apply plugin: 'com.google.gms.google-services'

apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'

android {
compileSdkVersion 34
flavorDimensions 'env'
Expand Down
19 changes: 0 additions & 19 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
buildscript {
ext.kotlin_version = '1.7.20'
repositories {
google()
mavenCentral {
content {
excludeGroup("com.facebook.react")
}
}

}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
Expand Down
34 changes: 26 additions & 8 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
include ':app'
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}
settings.ext.flutterSdkPath = flutterSdkPath()
ext.kotlin_version = '1.7.20'

def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")

assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.20" apply false
id "org.jetbrains.kotlin.plugin.serialization" version "1.7.20" apply false
id "com.google.gms.google-services" version "4.3.14" apply false
}

include ":app"
2 changes: 1 addition & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -576,11 +576,11 @@
9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
588939D828052E3E00FE3313 /* Embed App Extensions */,
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
FE698D0D002D57A6963D685A /* [CP] Embed Pods Frameworks */,
588939D828052E3E00FE3313 /* Embed App Extensions */,
);
buildRules = (
);
Expand Down
6 changes: 4 additions & 2 deletions lib/screen/account/recovery_phrase_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,10 @@ class _RecoveryPhrasePageState extends State<RecoveryPhrasePage> {

Widget _getBackUpState(BuildContext context) {
final theme = Theme.of(context);
final customLinkStyle = theme.textTheme.ppMori400Black14
.copyWith(decoration: TextDecoration.underline);
final customLinkStyle = theme.textTheme.ppMori400Black14.copyWith(
decoration: TextDecoration.underline,
decorationColor: AppColor.primaryBlack,
);
if (_isBackUpAvailable == null) {
return const SizedBox();
}
Expand Down
12 changes: 8 additions & 4 deletions lib/screen/customer_support/support_thread_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,10 @@ class _SupportThreadPageState extends State<SupportThreadPage>
},
child: Text(
'retry'.tr(),
style: theme.textTheme.ppMori400Black12
.copyWith(decoration: TextDecoration.underline),
style: theme.textTheme.ppMori400Black12.copyWith(
decoration: TextDecoration.underline,
decorationColor: AppColor.primaryBlack,
),
),
),
Text(
Expand All @@ -625,8 +627,10 @@ class _SupportThreadPageState extends State<SupportThreadPage>
},
child: Text(
'delete'.tr(),
style: theme.textTheme.ppMori400Black12
.copyWith(decoration: TextDecoration.underline),
style: theme.textTheme.ppMori400Black12.copyWith(
decoration: TextDecoration.underline,
decorationColor: AppColor.primaryBlack,
),
),
),
const SizedBox(width: 6),
Expand Down
2 changes: 2 additions & 0 deletions lib/screen/detail/artwork_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ class _ArtworkDetailPageState extends State<ArtworkDetailPage>
appBar: AppBar(
systemOverlayStyle: systemUiOverlayDarkStyle,
leadingWidth: 0,
leading: const SizedBox(),
centerTitle: false,
backgroundColor: Colors.transparent,
title: ArtworkDetailsHeader(
title: asset.title ?? '',
subTitle: subTitle,
Expand Down
5 changes: 4 additions & 1 deletion lib/screen/exhibitions/exhibitions_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,10 @@ class ExhibitionsPageState extends State<ExhibitionsPage> with RouteAware {
if (exhibition.curator != null)
RichText(
text: TextSpan(
style: theme.textTheme.ppMori400Grey14,
style: theme.textTheme.ppMori400Grey14
.copyWith(
decorationColor:
AppColor.disabledColor),
children: [
TextSpan(text: 'curated_by'.tr()),
TextSpan(
Expand Down
1 change: 1 addition & 0 deletions lib/screen/interactive_postcard/postcard_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ class ClaimedPostcardDetailPageState extends State<ClaimedPostcardDetailPage>
statusBarIconBrightness: Brightness.dark,
statusBarBrightness: Brightness.light,
),
scrolledUnderElevation: 0,
toolbarHeight: 70,
centerTitle: false,
title: Text(
Expand Down
4 changes: 2 additions & 2 deletions lib/screen/interactive_postcard/postcard_explain.dart
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ class _PostcardExplainState extends State<PostcardExplain> {

Widget _page1(VideoPlayerController controller) {
final theme = Theme.of(context);
final termsConditionsStyle = theme.textTheme.moMASans400Grey12
.copyWith(color: AppColor.auQuickSilver);
final termsConditionsStyle = theme.textTheme.moMASans400Grey12.copyWith(
color: AppColor.auQuickSilver, decorationColor: AppColor.auQuickSilver);
return SingleChildScrollView(
child: Column(
children: [
Expand Down
4 changes: 3 additions & 1 deletion lib/screen/migration/key_sync_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ class KeySyncPage extends StatelessWidget {
? theme.textTheme.ppMori400Black14
: theme.textTheme.ppMori400Black16)
.copyWith(
decoration: TextDecoration.underline),
decoration: TextDecoration.underline,
decorationColor: AppColor.primaryBlack,
),
),
),
],
Expand Down
6 changes: 4 additions & 2 deletions lib/screen/onboarding/view_address/view_existing_address.dart
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,10 @@ class _ViewExistingAddressState extends State<ViewExistingAddress> {
);
},
child: Text('or_import_address'.tr(),
style: theme.textTheme.ppMori400Black14
.copyWith(decoration: TextDecoration.underline)),
style: theme.textTheme.ppMori400Black14.copyWith(
decoration: TextDecoration.underline,
decorationColor: AppColor.primaryBlack,
)),
)
],
),
Expand Down
20 changes: 12 additions & 8 deletions lib/screen/playlists/view_playlist/view_playlist.dart
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,18 @@ class _ViewPlaylistScreenState extends State<ViewPlaylistScreen> {
),
Align(
alignment: Alignment.centerRight,
child: IconButton(
onPressed: () => Navigator.pop(context),
padding: const EdgeInsets.all(5),
constraints: const BoxConstraints(
maxHeight: 28, maxWidth: 28),
icon: const Icon(
AuIcon.close,
size: 18,
child: SizedBox(
height: 28,
width: 28,
child: IconButton(
onPressed: () => Navigator.pop(context),
padding: const EdgeInsets.all(0),
icon: const Icon(
AuIcon.close,
size: 18,
color: AppColor.primaryBlack,
weight: 2,
),
),
),
),
Expand Down
6 changes: 4 additions & 2 deletions lib/screen/release_notes_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ class _ReleaseNotesPageState extends State<ReleaseNotesPage> {
GestureDetector(
child: Text(
'open_source'.tr(),
style: theme.textTheme.ppMori400Black16
.copyWith(decoration: TextDecoration.underline),
style: theme.textTheme.ppMori400Black16.copyWith(
decoration: TextDecoration.underline,
decorationColor: AppColor.primaryBlack,
),
),
onTap: () async => launchUrl(
Uri.parse(AUTONOMY_CLIENT_GITHUB_LINK),
Expand Down
1 change: 1 addition & 0 deletions lib/screen/scan_qr/scan_qr_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ class ScanQRPageState extends State<ScanQRPage>
'show_my_code'.tr(),
style: theme.textTheme.ppMori400White14.copyWith(
decoration: TextDecoration.underline,
decorationColor: AppColor.white,
),
),
)
Expand Down
15 changes: 7 additions & 8 deletions lib/screen/settings/connection/accounts_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,8 @@ class _AccountsViewState extends State<AccountsView> {
),
),
),
Divider(
height: 1,
thickness: 1,
color: (_editingAccountKey == null ||
_editingAccountKey != account.key)
? null
: theme.colorScheme.primary)
const Divider(
height: 1, thickness: 1, color: AppColor.auLightGrey)
],
),
),
Expand All @@ -122,10 +117,12 @@ class _AccountsViewState extends State<AccountsView> {
CustomSlidableAction(
backgroundColor: AppColor.secondarySpanishGrey,
foregroundColor: theme.colorScheme.secondary,
padding: EdgeInsets.zero,
child: Semantics(
label: '${account.key}_hide',
child: SvgPicture.asset(
isHidden ? 'assets/images/unhide.svg' : 'assets/images/hide.svg'),
isHidden ? 'assets/images/unhide.svg' : 'assets/images/hide.svg',
),
),
onPressed: (_) {
unawaited(account.setViewAccount(!isHidden));
Expand All @@ -135,6 +132,7 @@ class _AccountsViewState extends State<AccountsView> {
CustomSlidableAction(
backgroundColor: AppColor.auGreyBackground,
foregroundColor: theme.colorScheme.secondary,
padding: EdgeInsets.zero,
child: Semantics(
label: '${account.name}_edit',
child: SvgPicture.asset(
Expand All @@ -152,6 +150,7 @@ class _AccountsViewState extends State<AccountsView> {
CustomSlidableAction(
backgroundColor: Colors.red,
foregroundColor: theme.colorScheme.secondary,
padding: EdgeInsets.zero,
child: Semantics(
label: '${account.name}_delete',
child: SvgPicture.asset('assets/images/trash.svg')),
Expand Down
Loading
Loading