diff --git a/.metadata b/.metadata index 4a2a6e1..b9e1657 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 2d2a1ffec95cc70a3218872a2cd3f8de4933c42f - channel: stable + revision: bbfbf1770cca2da7c82e887e4e4af910034800b6 + channel: beta project_type: app diff --git a/android/app/build.gradle b/android/app/build.gradle index 8068a41..231dabe 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -41,7 +41,7 @@ android { applicationId "com.papierkram.timetracker" minSdkVersion 18 targetSdkVersion 30 - versionCode 16 + versionCode 19 versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -50,7 +50,7 @@ android { release { keyAlias keystoreProperties['keyAlias'] keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null storePassword keystoreProperties['storePassword'] } } @@ -58,8 +58,6 @@ android { release { signingConfig signingConfigs.release - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } debug { diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 5aad577..04fa207 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -1,8 +1,2 @@ -## Flutter wrapper --keep class io.flutter.app.** { *; } --keep class io.flutter.plugin.** { *; } --keep class io.flutter.util.** { *; } --keep class io.flutter.view.** { *; } --keep class io.flutter.** { *; } --keep class io.flutter.plugins.** { *; } --dontwarn io.flutter.embedding.** +## https://github.com/flutter/flutter/issues/58479 +-keep class androidx.lifecycle.** { *; } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7608094..efeba47 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ diff --git a/android/app/src/main/kotlin/com/papierkram/timetracker/MainActivity.kt b/android/app/src/main/kotlin/com/papierkram/timetracker/MainActivity.kt index 738e5d2..d310dff 100644 --- a/android/app/src/main/kotlin/com/papierkram/timetracker/MainActivity.kt +++ b/android/app/src/main/kotlin/com/papierkram/timetracker/MainActivity.kt @@ -1,5 +1,12 @@ package com.papierkram.timetracker +import androidx.annotation.NonNull import io.flutter.embedding.android.FlutterActivity +import io.flutter.embedding.engine.FlutterEngine +import io.flutter.plugins.GeneratedPluginRegistrant -class MainActivity : FlutterActivity() +class MainActivity : FlutterActivity() { + override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine) + } +} diff --git a/pubspec.lock b/pubspec.lock index f1d3330..3320730 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -147,7 +147,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.4.0" + version: "3.4.1" collection: dependency: transitive description: @@ -526,7 +526,7 @@ packages: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.3" pedantic: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 556ad0e..4bec73a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Papierkram.de - TimeTracker as flutter app publish_to: 'none' -version: 1.5.5+2 +version: 1.5.5+5 environment: sdk: ">=2.7.0 <3.0.0"