Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0'
testImplementation files('libs/java-json.jar')
}
4 changes: 2 additions & 2 deletions consumer-proguard.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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.** { *; }
-keep class com.braze.** { *; }
8 changes: 4 additions & 4 deletions src/main/kotlin/com/mparticle/kits/AppboyKit.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/braze/BrazeUser.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/mparticle/kits/AppboyKitTest.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down