Skip to content

[MS-587] Resolve release compilation errors #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meladRaouf merged 2 commits into from
Jul 18, 2024
Merged

[MS-587] Resolve release compilation errors #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
522c945
[MS-587] downgrade gradle plugin version
meladRaouf Jul 17, 2024
96ed12a
Update build-logic/proguard-rules.pro
meladRaouf Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build-logic/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# Dont warn about the missing files during the obfuscation
-dontwarn com.simprints.**
# Do not obfuscate the simprints package
-keep class com.simprints.** { *; }
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kotlin_version = "2.0.0"
kotlin_coroutine_version = "1.8.1"
ksp_version = "2.0.0-1.0.23"

android_gradlePlugin_version = "8.5.1"
android_gradlePlugin_version = "8.3.1"
androidx_version = "1.6.1"
androidx_core_version = "1.13.1"
androidx_app_compat_version = "1.7.0"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jun 17 16:28:15 EEST 2024
#Mon Apr 17 08:02:27 EET 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions id/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
#net.zetetic:android-database-sqlcipher
-keep class net.sqlcipher.** { *; }

# Do not obfuscate names in out packages`
-keepnames class com.simprints.** { *; }
# Do not obfuscate names in simprints package
Comment thread
meladRaouf marked this conversation as resolved.
-keep class com.simprints.** { *; }
Copy link
Copy Markdown
Contributor

@BurningAXE BurningAXE Jul 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a related change?

Copy link
Copy Markdown
Collaborator Author

@meladRaouf meladRaouf Jul 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes
As seen in this trail, we should keep the class functions and fields, not just the names

image

# Keep all marshallable classes as-is
-keep class com.simprints.** extends java.io.Serializable { *; }
-keep class com.simprints.** extends android.os.Parcelable { *; }
Expand Down