Skip to content

Commit 9680b63

Browse files
committed
Remove ProGuard rules and update dependencies
1 parent d4878c2 commit 9680b63

File tree

9 files changed

+24
-53
lines changed

9 files changed

+24
-53
lines changed

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
[![Latest Version](https://img.shields.io/jitpack/version/com.github.bitfireAT/cert4android)](https://jitpack.io/#bitfireAT/cert4android)
66

77

8+
_This software is not affiliated to, nor has it been authorized, sponsored or otherwise approved
9+
by Google LLC. Android is a trademark of Google LLC._
10+
11+
812
# cert4android
913

1014
cert4android is a library for Android to manage custom certificates which has
1115
been developed for [DAVx⁵](https://www.davx5.com). Feel free to use
1216
it in your own open-source app.
1317

14-
_This software is not affiliated to, nor has it been authorized, sponsored or otherwise approved
15-
by Google LLC. Android is a trademark of Google LLC._
16-
1718
Generated KDoc: https://bitfireat.github.io/cert4android/
1819

1920
For questions, suggestions etc. use [Github discussions](https://github.com/bitfireAT/cert4android/discussions).
@@ -84,6 +85,9 @@ You can overwrite resources when you want, just have a look at the `res/strings`
8485
directory. Especially `certificate_notification_connection_security` and
8586
`trust_certificate_unknown_certificate_found` should contain your app name.
8687
88+
To view the available gradle tasks for the library: `./gradlew cert4android:tasks`
89+
(the `cert4android` module is defined in `settings.gradle`).
90+
8791
8892
# License
8993

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[versions]
2-
agp = "8.9.0"
2+
agp = "8.9.1"
33
androidx-activityCompose = "1.10.1"
44
androidx-appcompat = "1.7.0"
5-
androidx-core = "1.15.0"
5+
androidx-core = "1.16.0"
66
androidx-lifecycle = "2.8.7"
77
androidx-test-core = "1.6.1"
88
androidx-test-runner = "1.6.2"
99
androidx-test-rules = "1.6.1"
1010
# don't update to 2.5.3 / until https://github.com/google/conscrypt/issues/1268 is fixed
1111
#noinspection GradleDependency
1212
conscrypt = "2.5.2"
13-
compose-bom = "2025.02.00"
13+
compose-bom = "2025.04.00"
1414
dokka = "1.9.20"
1515
junit = "4.13.2"
16-
kotlin = "2.1.10"
17-
mockk = "1.13.16"
16+
kotlin = "2.1.20"
17+
mockk = "1.14.0"
1818
okhttp3 = "4.12.0"
1919

2020
[libraries]

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

lib/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ android {
3333
compose = true
3434
}
3535

36+
buildTypes {
37+
release {
38+
// Android libraries shouldn't be minified:
39+
// https://developer.android.com/studio/projects/android-library#Considerations
40+
isMinifyEnabled = false
41+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
42+
}
43+
}
44+
3645
lint {
3746
disable += listOf("MissingTranslation", "ExtraTranslation")
3847
}

lib/consumer-rules.pro

Whitespace-only changes.

lib/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
This file was deleted.

sample-app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ android {
2525
buildTypes {
2626
release {
2727
isMinifyEnabled = false
28-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
28+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
2929
}
3030
}
3131
compileOptions {

sample-app/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
This file was deleted.

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencyResolutionManagement {
1212
mavenCentral()
1313
}
1414
}
15-
rootProject.name = "cert4android"
15+
rootProject.name = "root"
1616
include ':sample-app'
1717
include ':lib'
1818
project(':lib').name = 'cert4android'

0 commit comments

Comments
 (0)