Skip to content

Commit

Permalink
Fix stupid flutter androidx bug flutter/flutter#58479
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonIT committed Aug 18, 2020
1 parent 7528032 commit 72c7ca3
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
applicationId "com.papierkram.timetracker"
minSdkVersion 18
targetSdkVersion 30
versionCode 16
versionCode 19
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -50,16 +50,14 @@ android {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {
release {
signingConfig signingConfigs.release

minifyEnabled true

proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
Expand Down
10 changes: 2 additions & 8 deletions android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -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.** { *; }
1 change: 0 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.papierkram.timetracker">

<uses-permission android:name="android.permission.INTERNET"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
}
}
4 changes: 2 additions & 2 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 72c7ca3

Please sign in to comment.