Skip to content

Commit

Permalink
Upgrade android sdk to 31 - resolves #223
Browse files Browse the repository at this point in the history
  • Loading branch information
maxisme committed Feb 5, 2022
1 parent d88bdca commit 9117f98
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
- uses: subosito/flutter-action@v1
with:
channel: 'stable'
- name: "Codesign"
- name: "Build & Codesign"
run: |
flutter config --enable-macos-desktop
flutter pub get
Expand All @@ -155,10 +155,10 @@ jobs:
/usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app
# codesign sparkle auto update
/usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app
/usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/Current/Updater.app
# codesign binaries
/usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/A/Sparkle
/usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/Current/Sparkle
/usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/MacOS/notifi
- name: "Create & Notarize .dmg"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Test
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
api-level: 31
arch: x86_64
profile: Nexus 6P
script: ./test_driver/test.sh "${{ matrix.device }}" "${{ matrix.branch }}" "${{ secrets.B64_ENV }}" "${{ secrets.B64_DEV_ENV }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Take Screenshot
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
api-level: 31
arch: x86_64
profile: Nexus 6P
script: |
Expand Down
7 changes: 2 additions & 5 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 30
compileSdkVersion 31

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -49,10 +49,9 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "it.notifi.notifi"
minSdkVersion 23
targetSdkVersion 30
targetSdkVersion 31
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand All @@ -68,8 +67,6 @@ android {

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.release
}
}
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
android:label="notifi">
<activity
android:name=".MainActivity"
android:exported="true"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.5.30'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion macos/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ target 'Runner' do
use_frameworks!
use_modular_headers!

pod 'Sparkle'
pod 'Sparkle', '2.0.0'
flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
end

Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dependencies:
cached_network_image: ^3.1.0
desktop_window: ^0.4.0
dio: ^4.0.0
firebase_core: ^1.8.0
firebase_messaging: ^10.0.9
firebase_core: ^1.12.0
firebase_messaging: ^11.2.6
flutter:
sdk: flutter
flutter_app_icon_badge: ^2.0.0
Expand Down
Binary file modified test/golden-asserts/screen/no-notifications.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/golden-asserts/screen/notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/golden-asserts/screen/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9117f98

Please sign in to comment.