From 5986e653b34af1db65d1976c6fa6cd823b1b80d2 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Tue, 29 Apr 2025 12:50:48 -0400 Subject: [PATCH 1/8] feat: Update Android Gradle plugin to 8.1.0 --- android-core/build.gradle | 4 +-- android-core/proguard.pro | 28 +++++++++++++++++++ android-kit-base/build.gradle | 6 ++-- build.gradle | 11 +++++++- gradle.properties | 5 +++- kit-plugin/build.gradle | 8 +++--- .../com/mparticle/kits/KitPlugin.groovy | 16 ++++------- testutils/build.gradle | 7 +++++ tooling/android-plugin/build.gradle | 6 ++-- tooling/common/build.gradle | 8 ++++-- tooling/custom-lint-rules/build.gradle | 15 +++++----- 11 files changed, 80 insertions(+), 34 deletions(-) diff --git a/android-core/build.gradle b/android-core/build.gradle index 3943a17f5..a36256bb4 100644 --- a/android-core/build.gradle +++ b/android-core/build.gradle @@ -13,8 +13,8 @@ android { exclude 'META-INF/LICENSE' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } String url = '\"\"' diff --git a/android-core/proguard.pro b/android-core/proguard.pro index 6862bc3b1..83724dc16 100644 --- a/android-core/proguard.pro +++ b/android-core/proguard.pro @@ -265,3 +265,31 @@ -keep class com.mparticle.RoktEvent { *; } -keepclassmembers class com.mparticle.RoktEvent { *; } -keepclasseswithmembers class com.mparticle.RoktEvent$* { *; } + + +# Firebase and GMS CloudMessaging +-dontwarn com.google.android.gms.cloudmessaging.** +-dontwarn com.google.firebase.messaging.** +-keep class com.google.firebase.messaging.** { *; } + +# Java 9+ StringConcatFactory +-dontwarn java.lang.invoke.StringConcatFactory +-keep class java.lang.invoke.StringConcatFactory { *; } + +# Keep lambdas +-keepclassmembers class * { + private static synthetic *** lambda$*(...); +} + +# Keep any classes referenced but not found during R8 minification +-ignorewarnings +-keep class ** { *; } + +# Additional rules to prevent minification errors with Kotlin +-keepattributes *Annotation*, InnerClasses, Signature, EnclosingMethod +-keepclassmembers class kotlin.Metadata { + public ; +} +-keepclassmembers class * { + @kotlin.Metadata ; +} \ No newline at end of file diff --git a/android-kit-base/build.gradle b/android-kit-base/build.gradle index 3115550af..12d479abe 100644 --- a/android-kit-base/build.gradle +++ b/android-kit-base/build.gradle @@ -14,7 +14,7 @@ android { testBuildType 'debug' defaultConfig { - minSdkVersion 14 + minSdk 14 targetSdk 33 testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } @@ -37,8 +37,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/build.gradle b/build.gradle index 90a83d47a..08a08428b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.kotlin_version = '1.9.0' - ext.gradle_version = '7.3.1' + ext.gradle_version = '8.1.0' repositories { mavenCentral() @@ -26,6 +26,15 @@ sonarqube { } subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } apply plugin: 'org.sonarqube' sonarqube { androidVariant "release" diff --git a/gradle.properties b/gradle.properties index b2e5897e7..9f4b6bedb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,7 @@ android.useAndroidX=true org.gradle.daemon=true org.gradle.jvmargs=-Xmx2560m -#-XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096 \ No newline at end of file +#-XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096 +android.defaults.buildfeatures.buildconfig=true +org.gradle.caching=true +systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true diff --git a/kit-plugin/build.gradle b/kit-plugin/build.gradle index 5d78bc289..d99a08bd2 100644 --- a/kit-plugin/build.gradle +++ b/kit-plugin/build.gradle @@ -9,13 +9,13 @@ apply from: '../scripts/maven.gradle' dependencies { implementation gradleApi() implementation localGroovy() - compileOnly "com.android.tools.build:gradle:7.3.1" - testImplementation "com.android.tools.build:gradle:4.1.3" + compileOnly "com.android.tools.build:gradle:$gradle_version" + testImplementation "com.android.tools.build:gradle:$gradle_version" } compileGroovy { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } dependencies { diff --git a/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy b/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy index f2bf43eb9..0e6320a02 100644 --- a/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy +++ b/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy @@ -139,17 +139,13 @@ class KitPlugin implements Plugin { url = 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/' } - def signingKey = System.getenv("mavenSigningKeyId") - def signingPassword = System.getenv("mavenSigningKeyPassword") - - if (signingKey != null) { - target.extensions.add('signing.keyId', signingKey) - target.extensions.add('signing.password', signingPassword) - - SigningExtension signing = new SigningExtension(target) + target.extensions.configure(SigningExtension) { signing -> signing.required = { target.gradle.taskGraph.hasTask("publishReleasePublicationToMavenRepository") } - signing.useInMemoryPgpKeys(signingKey, signingPassword) - signing.sign publishing.publications.findByName("release") + def signingKey = target.findProperty('signingKey') ?: System.getenv("mavenSigningKeyId") + def signingPassword = target.findProperty('signingPassword') ?: System.getenv("mavenSigningKeyPassword") + if (signingKey && signingPassword) { + signing.useInMemoryPgpKeys(target.property('signingKey'), target.property('signingPassword')) + } } } diff --git a/testutils/build.gradle b/testutils/build.gradle index 707ee2dcd..c0ac695af 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -5,7 +5,14 @@ android { namespace 'com.mparticle.testutils' testNamespace 'com.mparticle.legacyTest' compileSdk 33 + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 // Set to your desired Java version + targetCompatibility = JavaVersion.VERSION_17 // Set to your desired Java version + } + kotlinOptions { + jvmTarget = "17" // Should match the Java version above + } defaultConfig { //This is set to 21 to avoid slow multidex. minSdk 21 diff --git a/tooling/android-plugin/build.gradle b/tooling/android-plugin/build.gradle index ee4b47d35..6eb7f296d 100644 --- a/tooling/android-plugin/build.gradle +++ b/tooling/android-plugin/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'groovy' apply plugin: 'kotlin' -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 ext { @@ -26,7 +26,7 @@ configurations { dependencies { fatJar project(':tooling:common') - compileOnly configurations.fatJar + compileOnly files(configurations.fatJar) implementation gradleApi() implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation files('libs/java-json.jar') diff --git a/tooling/common/build.gradle b/tooling/common/build.gradle index d1419a6bc..70ddb0bae 100644 --- a/tooling/common/build.gradle +++ b/tooling/common/build.gradle @@ -16,6 +16,10 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +kotlin { + jvmToolchain(17) } \ No newline at end of file diff --git a/tooling/custom-lint-rules/build.gradle b/tooling/custom-lint-rules/build.gradle index 99af1017b..991a16e38 100755 --- a/tooling/custom-lint-rules/build.gradle +++ b/tooling/custom-lint-rules/build.gradle @@ -4,8 +4,8 @@ apply plugin: 'java-library' apply plugin: 'kotlin' apply plugin: 'com.android.lint' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 17 +targetCompatibility = 17 buildscript { ext { @@ -39,7 +39,7 @@ dependencies { lintBuild files(jar) lintJar files('libs/mparticle-min.jar') lintJar project(':tooling:common') - implementation configurations.lintJar + implementation files(configurations.lintJar) compileOnly "com.android.tools.lint:lint-api:$lintVersion" compileOnly "com.android.tools.lint:lint-checks:$lintVersion" compileOnly 'org.codehaus.groovy:groovy-all:3.0.13' @@ -51,7 +51,7 @@ dependencies { jar { dependsOn(":tooling:common:jar") - archiveName 'lint.jar' + archiveFileName = 'lint.jar' manifest { attributes 'Manifest-Version': 1.0 attributes 'Lint-Registry-v2': 'com.mparticle.lints.MParticleIssueRegistry' @@ -74,10 +74,9 @@ rootProject.project('android-core').android.buildTypes.all { task zipSources(type: Jar) { def fileName = "$project.rootDir/android-core/build/intermediates/javac/${targetBuildType}/classes" - from(fileTree(dir: fileName)) { - destinationDir new File("$project.projectDir/libs") - archiveName "mparticle.jar" - } + from(fileTree(dir: fileName)) + destinationDirectory.set(new File("$project.projectDir/libs")) + archiveFileName.set("mparticle.jar") outputs.upToDateWhen { false } } From fb6747d7e300234f83679b7c32cb997a64ddb67d Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Wed, 30 Apr 2025 10:43:24 -0400 Subject: [PATCH 2/8] add othere file related to gradle 8 changes --- gradle/wrapper/gradle-wrapper.properties | 6 +++--- scripts/maven.gradle | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 60639c745..284897427 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 04 12:58:48 PDT 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/scripts/maven.gradle b/scripts/maven.gradle index 365510932..d1b191c7d 100644 --- a/scripts/maven.gradle +++ b/scripts/maven.gradle @@ -6,7 +6,16 @@ allprojects { ext."signing.secretKeyRingFile" = System.getenv("mavenSigningKeyRingFile") ext."signing.password" = System.getenv("mavenSigningKeyPassword") } - +// For AGP 8.x compatibility, configure Android library projects +if (project.plugins.findPlugin("com.android.library")) { + android { + publishing { + // Configure publishing for both variants + singleVariant("release") + singleVariant("debug") + } + } +} afterEvaluate { publishing { publications { @@ -115,5 +124,5 @@ afterEvaluate { } //Publishing task aliases for simpler local development -task publishLocal { dependsOn "publishDebugPublicationToMavenLocal" } -task publishReleaseLocal { dependsOn "publishReleasePublicationToMavenLocal" } +task publishLocal { dependsOn "publishDebugPublicationToMavenLocal"} +task publishReleaseLocal { dependsOn "publishReleasePublicationToMavenLocal"} From 91999e38218d694d4535898f031bbee3b8e354b8 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Thu, 15 May 2025 14:47:09 -0400 Subject: [PATCH 3/8] Address review comments --- gradle.properties | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9f4b6bedb..0ddb20a81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,4 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xmx2560m #-XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096 android.defaults.buildfeatures.buildconfig=true -org.gradle.caching=true systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 284897427..42defcc94 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3f5ec4ab58d8721dca7523aec9629d3c279b6e7a Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Thu, 26 Jun 2025 15:31:22 -0400 Subject: [PATCH 4/8] fix merge conflict --- android-core/proguard.pro | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/android-core/proguard.pro b/android-core/proguard.pro index 83724dc16..5b4ce1c11 100644 --- a/android-core/proguard.pro +++ b/android-core/proguard.pro @@ -252,21 +252,6 @@ public static final ** CREATOR; } --keepclassmembers class com.mparticle.Rokt { - (...); - void *(...); - void *$default(...); - ; -} - --keep interface com.mparticle.MpRoktEventCallback { *; } --keep interface com.mparticle.UnloadReasons { *; } --keep class com.mparticle.UnloadReasons { *; } --keep class com.mparticle.RoktEvent { *; } --keepclassmembers class com.mparticle.RoktEvent { *; } --keepclasseswithmembers class com.mparticle.RoktEvent$* { *; } - - # Firebase and GMS CloudMessaging -dontwarn com.google.android.gms.cloudmessaging.** -dontwarn com.google.firebase.messaging.** @@ -292,4 +277,17 @@ } -keepclassmembers class * { @kotlin.Metadata ; -} \ No newline at end of file +} +-keepclassmembers class com.mparticle.Rokt { + (...); + void *(...); + void *$default(...); + ; +} + +-keep interface com.mparticle.MpRoktEventCallback { *; } +-keep interface com.mparticle.UnloadReasons { *; } +-keep class com.mparticle.UnloadReasons { *; } +-keep class com.mparticle.RoktEvent { *; } +-keepclassmembers class com.mparticle.RoktEvent { *; } +-keepclasseswithmembers class com.mparticle.RoktEvent$* { *; } From d86dc132dff9e6df9cc6c7dd2701397fee453f51 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Mon, 30 Jun 2025 17:02:59 -0400 Subject: [PATCH 5/8] Address review comments --- android-core/build.gradle | 4 ++-- android-kit-base/build.gradle | 4 ++-- gradle.properties | 1 + kit-plugin/build.gradle | 4 ++-- testutils/build.gradle | 6 +++--- tooling/android-plugin/build.gradle | 4 ++-- tooling/common/build.gradle | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/android-core/build.gradle b/android-core/build.gradle index a36256bb4..f3230652f 100644 --- a/android-core/build.gradle +++ b/android-core/build.gradle @@ -13,8 +13,8 @@ android { exclude 'META-INF/LICENSE' } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.toVersion(JAVA_VERSION) + targetCompatibility JavaVersion.toVersion(JAVA_VERSION) } String url = '\"\"' diff --git a/android-kit-base/build.gradle b/android-kit-base/build.gradle index 12d479abe..2a1cdcc97 100644 --- a/android-kit-base/build.gradle +++ b/android-kit-base/build.gradle @@ -37,8 +37,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.toVersion(JAVA_VERSION) + targetCompatibility JavaVersion.toVersion(JAVA_VERSION) } } diff --git a/gradle.properties b/gradle.properties index 0ddb20a81..2e22ec6d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,3 +5,4 @@ org.gradle.jvmargs=-Xmx2560m #-XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096 android.defaults.buildfeatures.buildconfig=true systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true +JAVA_VERSION=17 diff --git a/kit-plugin/build.gradle b/kit-plugin/build.gradle index d99a08bd2..1dd5660b1 100644 --- a/kit-plugin/build.gradle +++ b/kit-plugin/build.gradle @@ -14,8 +14,8 @@ dependencies { } compileGroovy { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION) + targetCompatibility = JavaVersion.toVersion(JAVA_VERSION) } dependencies { diff --git a/testutils/build.gradle b/testutils/build.gradle index c0ac695af..2f34899c8 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -6,12 +6,12 @@ android { testNamespace 'com.mparticle.legacyTest' compileSdk 33 compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 // Set to your desired Java version - targetCompatibility = JavaVersion.VERSION_17 // Set to your desired Java version + sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION) + targetCompatibility = JavaVersion.toVersion(JAVA_VERSION) } kotlinOptions { - jvmTarget = "17" // Should match the Java version above + jvmTarget = JAVA_VERSION } defaultConfig { //This is set to 21 to avoid slow multidex. diff --git a/tooling/android-plugin/build.gradle b/tooling/android-plugin/build.gradle index 6eb7f296d..1e5dce121 100644 --- a/tooling/android-plugin/build.gradle +++ b/tooling/android-plugin/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'groovy' apply plugin: 'kotlin' -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION) +targetCompatibility = JavaVersion.toVersion(JAVA_VERSION) ext { diff --git a/tooling/common/build.gradle b/tooling/common/build.gradle index 70ddb0bae..3969cecc4 100644 --- a/tooling/common/build.gradle +++ b/tooling/common/build.gradle @@ -16,10 +16,10 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION) + targetCompatibility = JavaVersion.toVersion(JAVA_VERSION) } kotlin { - jvmToolchain(17) + jvmToolchain(Integer.parseInt(JAVA_VERSION)) } \ No newline at end of file From 42495cdd267701655ecf8e74e5e38059644537ce Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Wed, 2 Jul 2025 17:01:05 -0400 Subject: [PATCH 6/8] Address review comments --- android-core/proguard.pro | 5 ----- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../src/main/groovy/com/mparticle/kits/KitPlugin.groovy | 6 +++--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/android-core/proguard.pro b/android-core/proguard.pro index 5b4ce1c11..dbb36cbe6 100644 --- a/android-core/proguard.pro +++ b/android-core/proguard.pro @@ -265,11 +265,6 @@ -keepclassmembers class * { private static synthetic *** lambda$*(...); } - -# Keep any classes referenced but not found during R8 minification --ignorewarnings --keep class ** { *; } - # Additional rules to prevent minification errors with Kotlin -keepattributes *Annotation*, InnerClasses, Signature, EnclosingMethod -keepclassmembers class kotlin.Metadata { diff --git a/build.gradle b/build.gradle index 08a08428b..8f577c9ea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.kotlin_version = '1.9.0' - ext.gradle_version = '8.1.0' + ext.gradle_version = '8.1.4' repositories { mavenCentral() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 42defcc94..bdc9a83b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy b/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy index 0e6320a02..c1a3db46d 100644 --- a/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy +++ b/kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy @@ -140,9 +140,9 @@ class KitPlugin implements Plugin { } target.extensions.configure(SigningExtension) { signing -> - signing.required = { target.gradle.taskGraph.hasTask("publishReleasePublicationToMavenRepository") } - def signingKey = target.findProperty('signingKey') ?: System.getenv("mavenSigningKeyId") - def signingPassword = target.findProperty('signingPassword') ?: System.getenv("mavenSigningKeyPassword") + signing.required = { target.gradle.taskGraph.hasTask('publishReleasePublicationToMavenRepository') } + def signingKey = target.findProperty('signingKey') ?: System.getenv('mavenSigningKeyId') + def signingPassword = target.findProperty('signingPassword') ?: System.getenv('mavenSigningKeyPassword') if (signingKey && signingPassword) { signing.useInMemoryPgpKeys(target.property('signingKey'), target.property('signingPassword')) } From 8b19174d861c4380e6f84eb6e70f2f5b3292cc99 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Thu, 3 Jul 2025 17:55:27 -0400 Subject: [PATCH 7/8] Updated proguard rule for public method --- android-core/proguard.pro | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/android-core/proguard.pro b/android-core/proguard.pro index dbb36cbe6..d522ffa4a 100644 --- a/android-core/proguard.pro +++ b/android-core/proguard.pro @@ -273,11 +273,12 @@ -keepclassmembers class * { @kotlin.Metadata ; } --keepclassmembers class com.mparticle.Rokt { - (...); - void *(...); - void *$default(...); - ; + +-keep public class com.mparticle.Rokt { + public (...); + public void *(...); + public void *$default(...); + public ; } -keep interface com.mparticle.MpRoktEventCallback { *; } From 94d613e591dc8f754a96b1564480ace99db92c53 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Fri, 21 Nov 2025 16:06:55 -0500 Subject: [PATCH 8/8] upgrade ktlint plugin to version 13.0.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8f577c9ea..4aa43063c 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { plugins { id "org.sonarqube" version "3.5.0.2730" - id "org.jlleitschuh.gradle.ktlint" version "11.2.0" + id "org.jlleitschuh.gradle.ktlint" version "13.0.0" } sonarqube {