diff --git a/SampleApplication/app/build.gradle b/SampleApplication/app/build.gradle index bc503b3..f4e9d37 100644 --- a/SampleApplication/app/build.gradle +++ b/SampleApplication/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdk = 34 buildToolsVersion "27.0.3" defaultConfig { applicationId "com.mparticle.branchsample" - minSdkVersion 16 - targetSdkVersion 27 + minSdk = 25 + targetSdk = 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -19,22 +19,25 @@ android { } packagingOptions { exclude 'META-INF/proguard/androidx-annotations.pro' + exclude 'META-INF/versions/9/module-info.class' } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.0.2' - implementation 'com.android.support:design:27.0.2' - implementation 'com.android.installreferrer:installreferrer:[1.0, )' - -// implementation 'com.mparticle:android-branch-kit:5+' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.8.0' + implementation 'com.android.installreferrer:installreferrer:2.2' + + // Local project dependency + api project(':local-mParticle-Branch-kit') + + // Uncomment below to use published version instead + // implementation 'com.mparticle:android-branch-kit:5+' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' + androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1', { + exclude group: 'androidx.test', module: 'runner' }) - - api project(':local-mParticle-Branch-kit') -} \ No newline at end of file +} diff --git a/SampleApplication/app/src/main/AndroidManifest.xml b/SampleApplication/app/src/main/AndroidManifest.xml index 1f7ad35..a81275e 100644 --- a/SampleApplication/app/src/main/AndroidManifest.xml +++ b/SampleApplication/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ - \ No newline at end of file + diff --git a/SampleApplication/app/src/main/java/com/mparticle/branchsample/SampleApplication.java b/SampleApplication/app/src/main/java/com/mparticle/branchsample/SampleApplication.java index 01bc092..65b4732 100644 --- a/SampleApplication/app/src/main/java/com/mparticle/branchsample/SampleApplication.java +++ b/SampleApplication/app/src/main/java/com/mparticle/branchsample/SampleApplication.java @@ -15,7 +15,7 @@ public class SampleApplication extends Application implements AttributionListener { private IBranchEvents branchEventCallback; private static SampleApplication instance; - + @Override public void onCreate() { super.onCreate(); @@ -30,15 +30,15 @@ public void onCreate() { //that is passed to the Branch SDK's initSession() API. .logLevel(MParticle.LogLevel.VERBOSE) .build(); - + MParticle.start(options); } - + public static void setBranchEventCallback(IBranchEvents branchEventCallback) { instance.branchEventCallback = branchEventCallback; } - - + + /** * A few typical scenarios where this callback would be invoked: *

@@ -86,7 +86,7 @@ public void onResult(AttributionResult attributionResult) { } } } - + @Override public void onError(AttributionError attributionError) { //if the Branch SDK returns an error, it will be surfaced here. @@ -94,7 +94,7 @@ public void onError(AttributionError attributionError) { branchEventCallback.onBranchInitialised(new JSONObject()); } } - + public interface IBranchEvents { void onBranchInitialised(JSONObject params); } diff --git a/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/HomeActivity.java b/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/HomeActivity.java index 9927e78..ee1e490 100644 --- a/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/HomeActivity.java +++ b/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/HomeActivity.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.view.View; import android.widget.CompoundButton; diff --git a/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/SplashActivity.java b/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/SplashActivity.java index d8483ab..3e9b42f 100644 --- a/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/SplashActivity.java +++ b/SampleApplication/app/src/main/java/com/mparticle/branchsample/activities/SplashActivity.java @@ -5,7 +5,7 @@ import android.os.Bundle; import android.os.Handler; import androidx.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.mparticle.MPEvent; import com.mparticle.MParticle; @@ -25,28 +25,28 @@ */ public class SplashActivity extends AppCompatActivity implements SampleApplication.IBranchEvents { - + private static final int SPLASH_DELAY = 1500; - + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.splash_activity); SampleApplication.setBranchEventCallback(this); } - + @Override protected void onStart() { super.onStart(); new Handler().postDelayed(new Runnable() { @Override public void run() { - - + + } }, SPLASH_DELAY); } - + /** * Note : Branch needs the new intents to be set to the activity if the launch mode is `SingleTask` **/ @@ -54,14 +54,14 @@ public void run() { protected void onNewIntent(Intent intent) { this.setIntent(intent); } - + @Override public void onBranchInitialised(JSONObject params) { final Intent intent = new Intent(SplashActivity.this, HomeActivity.class); if (params.optBoolean("+clicked_branch_link")) { Map infoMap = new HashMap<>(); infoMap.put("Referred Link", params.optString("~referring_link")); - + MPEvent event = new MPEvent.Builder("Referred Session", MParticle.EventType.UserContent) .duration(300) .info(infoMap) @@ -77,5 +77,5 @@ public void run() { } }, 1500); } - + } diff --git a/SampleApplication/build.gradle b/SampleApplication/build.gradle index bf12b04..603eba4 100644 --- a/SampleApplication/build.gradle +++ b/SampleApplication/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/SampleApplication/gradle.properties b/SampleApplication/gradle.properties index aac7c9b..6874ee6 100644 --- a/SampleApplication/gradle.properties +++ b/SampleApplication/gradle.properties @@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true + +android.useAndroidX=true +android.enableJetifier=true diff --git a/SampleApplication/gradle/wrapper/gradle-wrapper.properties b/SampleApplication/gradle/wrapper/gradle-wrapper.properties index c3510d6..5264804 100644 --- a/SampleApplication/gradle/wrapper/gradle-wrapper.properties +++ b/SampleApplication/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/SampleApplication/settings.gradle b/SampleApplication/settings.gradle index ecf5751..e03f143 100644 --- a/SampleApplication/settings.gradle +++ b/SampleApplication/settings.gradle @@ -1,3 +1,3 @@ include ':app' include ':local-mParticle-Branch-kit' -project(':local-mParticle-Branch-kit').projectDir = new File(settingsDir, '../../mparticle-for-android-branch') +project(':local-mParticle-Branch-kit').projectDir = new File(settingsDir, '..')