From e040f5351eba1c08a12f22a264501d089511c180 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:19:07 +0000 Subject: [PATCH 1/5] chore: bump org.sonarqube from 3.5.0.2730 to 4.0.0.2929 (#122) Bumps org.sonarqube from 3.5.0.2730 to 4.0.0.2929. --- updated-dependencies: - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5481239..83dda12 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { } plugins { - id "org.sonarqube" version "3.5.0.2730" + id "org.sonarqube" version "4.0.0.2929" id "org.jlleitschuh.gradle.ktlint" version "11.2.0" } From 4cfd661121428ef9bf74e24b0fdab7de870afeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klemen=20Tu=C5=A1ar?= Date: Fri, 24 Feb 2023 20:34:18 +0000 Subject: [PATCH 2/5] :arrow_up: Upgrade Braze Android SDK from v23 to v24 --- build.gradle | 2 +- src/main/kotlin/com/mparticle/kits/AppboyKit.kt | 8 ++++---- src/test/kotlin/com/braze/BrazeUser.kt | 2 +- src/test/kotlin/com/mparticle/kits/AppboyKitTest.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 83dda12..c447757 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,6 @@ repositories { dependencies { compileOnly 'com.google.firebase:firebase-messaging:[10.2.1, )' - api 'com.appboy:android-sdk-ui:23.3.0' + api 'com.appboy:android-sdk-ui:24.2.0' testImplementation files('libs/java-json.jar') } diff --git a/src/main/kotlin/com/mparticle/kits/AppboyKit.kt b/src/main/kotlin/com/mparticle/kits/AppboyKit.kt index c159881..0c91552 100644 --- a/src/main/kotlin/com/mparticle/kits/AppboyKit.kt +++ b/src/main/kotlin/com/mparticle/kits/AppboyKit.kt @@ -5,10 +5,10 @@ import android.app.Application.ActivityLifecycleCallbacks import android.content.Context import android.content.Intent import android.os.Handler -import com.appboy.enums.Gender -import com.appboy.enums.Month -import com.appboy.enums.SdkFlavor -import com.appboy.enums.NotificationSubscriptionType +import com.braze.enums.Gender +import com.braze.enums.Month +import com.braze.enums.SdkFlavor +import com.braze.enums.NotificationSubscriptionType import com.braze.Braze import com.braze.BrazeActivityLifecycleCallbackListener import com.braze.BrazeUser diff --git a/src/test/kotlin/com/braze/BrazeUser.kt b/src/test/kotlin/com/braze/BrazeUser.kt index 17419f1..f932238 100644 --- a/src/test/kotlin/com/braze/BrazeUser.kt +++ b/src/test/kotlin/com/braze/BrazeUser.kt @@ -1,6 +1,6 @@ package com.braze -import com.appboy.enums.Month +import com.braze.enums.Month import java.util.HashMap import java.util.ArrayList import java.lang.NullPointerException diff --git a/src/test/kotlin/com/mparticle/kits/AppboyKitTest.kt b/src/test/kotlin/com/mparticle/kits/AppboyKitTest.kt index 9153cc5..e7b8b59 100644 --- a/src/test/kotlin/com/mparticle/kits/AppboyKitTest.kt +++ b/src/test/kotlin/com/mparticle/kits/AppboyKitTest.kt @@ -1,6 +1,6 @@ package com.mparticle.kits -import com.appboy.enums.Month +import com.braze.enums.Month import com.braze.Braze import com.mparticle.MPEvent import com.mparticle.MParticle From 7f01a3f3672b5d62527b353cc2cb61816b897b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klemen=20Tu=C5=A1ar?= Date: Fri, 10 Mar 2023 08:17:08 +0000 Subject: [PATCH 3/5] :arrow_up: Bump Braze Android SDK to 24.3.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c447757..de8ccae 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,6 @@ repositories { dependencies { compileOnly 'com.google.firebase:firebase-messaging:[10.2.1, )' - api 'com.appboy:android-sdk-ui:24.2.0' + api 'com.appboy:android-sdk-ui:24.3.0' testImplementation files('libs/java-json.jar') } From 39e5b0dc6bb9e328c38555f5b13aa3033cb2a53f Mon Sep 17 00:00:00 2001 From: Klemen Tusar Date: Wed, 5 Apr 2023 09:30:02 +0100 Subject: [PATCH 4/5] :wrench: Replace com.appboy with com.braze in proguard --- consumer-proguard.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/consumer-proguard.pro b/consumer-proguard.pro index b5dd544..84babb1 100644 --- a/consumer-proguard.pro +++ b/consumer-proguard.pro @@ -2,7 +2,7 @@ -dontwarn com.amazon.device.messaging.** -dontwarn bo.app.** --dontwarn com.appboy.ui.** +-dontwarn com.braze.ui.** -dontwarn com.google.android.gms.** -keep class bo.app.** { *; } --keep class com.appboy.** { *; } \ No newline at end of file +-keep class com.braze.** { *; } \ No newline at end of file From 54f6fb865736d7f8ec1d31d4afaab709a27568db Mon Sep 17 00:00:00 2001 From: Klemen Tusar Date: Mon, 24 Apr 2023 17:25:53 +0100 Subject: [PATCH 5/5] :rewind: Revert https://github.com/mparticle-integrations/mparticle-android-integration-appboy/commit/e040f5351eba1c08a12f22a264501d089511c180 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index de8ccae..7c9f260 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { } plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "3.5.0.2730" id "org.jlleitschuh.gradle.ktlint" version "11.2.0" }