Skip to content

Commit

Permalink
Upgrade to android gradle plugin 7.2.1 and add proguard
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSchubert committed Jul 7, 2022
1 parent 88d9426 commit 3299b3b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: chmod +x gradlew
- name: Build APK
run: bash ./gradlew assembleRelease --stacktrace
- name: Build signed APK
- name: Sign apk
uses: r0adkll/sign-android-release@v1
with:
releaseDirectory: android/build/outputs/apk/release
Expand Down
7 changes: 4 additions & 3 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ android {
applicationId = "com.inspiredandroid.linuxcommandbibliotheca"
minSdkVersion(24)
targetSdkVersion(33)
versionCode = 69
versionName = "3.0.0"
versionCode = 71
versionName = "3.0.1"
}

sourceSets["main"].assets.setSrcDirs(listOf("../assets"))
Expand All @@ -41,13 +41,14 @@ android {
buildTypes {
getByName("release") {
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
getByName("debug") {
isMinifyEnabled = false
}
}

lint {
isAbortOnError = false
abortOnError = false
}
}
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
classpath("com.android.tools.build:gradle:7.0.4")
classpath("com.android.tools.build:gradle:7.2.1")
classpath( "com.squareup.sqldelight:gradle-plugin:1.5.3")
}
}
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ android {
}

lint {
isAbortOnError = false
abortOnError = false
}
}

Expand Down
2 changes: 2 additions & 0 deletions proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# VerifyError: Superclass androidx.core.app.f of androidx.activity.ComponentActivity is declared final / https://issuetracker.google.com/issues/237785592
-keep class androidx.core.app.** { *; }

0 comments on commit 3299b3b

Please sign in to comment.