From 840d8c2d6e9242e9cdd268ddd75cd62d897ed385 Mon Sep 17 00:00:00 2001 From: Brian Giori Date: Fri, 16 Aug 2024 13:09:10 -0700 Subject: [PATCH] fix: update build gradle --- build.gradle | 6 ++--- example/build.gradle | 3 --- .../exampleapp/ExampleInstrumentedTest.java | 26 ------------------- sdk/build.gradle | 2 +- 4 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 example/src/androidTest/java/com/amplitude/exampleapp/ExampleInstrumentedTest.java diff --git a/build.gradle b/build.gradle index fa76bcb..d7009c3 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'org.jetbrains.dokka' apply plugin: 'org.jlleitschuh.gradle.ktlint' buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.8.22' ext.dokka_version = '1.4.32' repositories { @@ -16,10 +16,10 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" classpath "io.github.gradle-nexus:publish-plugin:1.1.0" - classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:12.1.1" } } diff --git a/example/build.gradle b/example/build.gradle index 9de1399..5438729 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -41,12 +41,9 @@ dependencies { implementation 'androidx.navigation:navigation-ui:2.1.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'com.amplitude:android-sdk:2.39.8' -// implementation("com.amplitude:experiment-android-client:0.0.4") implementation project(path: ':sdk') implementation 'com.squareup.okhttp3:okhttp:4.2.2' implementation 'androidx.core:core-ktx:1.13.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/example/src/androidTest/java/com/amplitude/exampleapp/ExampleInstrumentedTest.java b/example/src/androidTest/java/com/amplitude/exampleapp/ExampleInstrumentedTest.java deleted file mode 100644 index 33c4d6c..0000000 --- a/example/src/androidTest/java/com/amplitude/exampleapp/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.amplitude.exampleapp; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.amplitude.exampleapp", appContext.getPackageName()); - } -} diff --git a/sdk/build.gradle b/sdk/build.gradle index e1ad0fd..da0c70d 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3") testImplementation 'junit:junit:4.13.2' - testImplementation 'org.json:json:20201115' + testImplementation 'org.json:json:20240303' testImplementation project(path: ':sdk') testImplementation "io.mockk:mockk:1.12.0" }