Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hotfix_release13' into 'master'

Browse Source 
Hotfix release: fix creation activity crashes

See merge request pixeldroid/PixelDroid!435
This commit is contained in:
Matthieu 2022-06-24 16:11:48 +00:00
commit e704d023a9
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -22,13 +22,13 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "1.8"
freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"] freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
} }
defaultConfig { defaultConfig {
applicationId "org.pixeldroid.app" applicationId "org.pixeldroid.app"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 32 targetSdkVersion 32
versionCode 13 versionCode 14
versionName "1.0.beta" + versionCode versionName "1.0.beta" + versionCode
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

18
app/proguard-rules.pro vendored
View File

@ -5,16 +5,23 @@
-optimizations !code/simplification/cast,!field/*,!class/merging/* -optimizations !code/simplification/cast,!field/*,!class/merging/*
-optimizationpasses 6 -optimizationpasses 6
-allowaccessmodification -allowaccessmodification
-dontpreverify
# Don't obfuscate because it makes traces useless
-dontobfuscate
-dontusemixedcaseclassnames -dontusemixedcaseclassnames
-dontskipnonpubliclibraryclasses
-keepattributes *Annotation* -keepattributes *Annotation*
# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native # For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
-keepclasseswithmembernames class * { -keepclasseswithmembernames class * {
native <methods>; native <methods>;
} }
# keep ViewModel constructors to make ViewModelFactories work
-keepclassmembers public class * extends androidx.lifecycle.ViewModel {
public <init>(...);
}
# keep setters in Views so that animations can still work. # keep setters in Views so that animations can still work.
# see http://proguard.sourceforge.net/manual/examples.html#beans # see http://proguard.sourceforge.net/manual/examples.html#beans
-keepclassmembers public class * extends android.view.View { -keepclassmembers public class * extends android.view.View {
@ -69,7 +76,14 @@
# remove some kotlin overhead # remove some kotlin overhead
-assumenosideeffects class kotlin.jvm.internal.Intrinsics { -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
static void checkNotNull(java.lang.Object);
static void checkNotNull(java.lang.Object, java.lang.String);
static void checkParameterIsNotNull(java.lang.Object, java.lang.String); static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
static void checkNotNullParameter(java.lang.Object, java.lang.String);
static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String); static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String);
static void checkNotNullExpressionValue(java.lang.Object, java.lang.String);
static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String);
static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String, java.lang.String);
static void throwUninitializedPropertyAccessException(java.lang.String); static void throwUninitializedPropertyAccessException(java.lang.String);
} }