diff --git a/build.gradle b/build.gradle index f5b7cd2..3740e2d 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin' apply plugin: 'org.jetbrains.dokka' buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = '1.7.0' apply from: 'common.gradle' repositories { diff --git a/common.gradle b/common.gradle index 5224b0e..79f6639 100644 --- a/common.gradle +++ b/common.gradle @@ -1,4 +1,4 @@ -ext.version = "1.0.1" +ext.version = "1.0.2" ext.group = "nz.co.trademe.plunge" ext.repo = "plunge" ext.org = "trademe" @@ -8,8 +8,7 @@ ext.developerConnection = 'scm:git:ssh://github.com/TradeMe/Plunge.git' ext.url = 'https://github.com/TradeMe/Plunge' ext.description = 'Plunge is a small Android library to make handling Deep Links Simple and testable' -ext.compile_sdk = 30 +ext.compile_sdk = 32 ext.min_sdk = 19 -ext.kotlin_version = '1.5.0' -ext.android_maven_version = '3.6.2' -ext.android_gradle_plugin_version = '4.0.1' \ No newline at end of file +ext.kotlin_version = '1.7.0' +ext.android_gradle_plugin_version = '7.1.2' \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 23339e0..bfa634d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx1536m # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true + # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0e26545..2ba107a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip diff --git a/plunge-gradle-plugin/build.gradle b/plunge-gradle-plugin/build.gradle index dc3729f..88a358b 100644 --- a/plunge-gradle-plugin/build.gradle +++ b/plunge-gradle-plugin/build.gradle @@ -20,7 +20,7 @@ dependencies { // External dependencies compileOnly gradleApi() implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' implementation "com.android.tools.build:gradle:$android_gradle_plugin_version" // Plunge parsing diff --git a/plunge-parsing/build.gradle b/plunge-parsing/build.gradle index 885c6be..5555dec 100644 --- a/plunge-parsing/build.gradle +++ b/plunge-parsing/build.gradle @@ -33,7 +33,7 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0" + api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0' } java { diff --git a/plunge-test/build.gradle b/plunge-test/build.gradle index c4f9d11..42a80af 100644 --- a/plunge-test/build.gradle +++ b/plunge-test/build.gradle @@ -37,12 +37,12 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'junit:junit:4.13.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation project(':plunge') implementation project(':plunge-parsing') - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/plunge-test/src/main/java/nz/co/trademe/plunge/test/PlungeTestRunner.kt b/plunge-test/src/main/java/nz/co/trademe/plunge/test/PlungeTestRunner.kt index c521ab5..63fab86 100644 --- a/plunge-test/src/main/java/nz/co/trademe/plunge/test/PlungeTestRunner.kt +++ b/plunge-test/src/main/java/nz/co/trademe/plunge/test/PlungeTestRunner.kt @@ -24,6 +24,9 @@ object PlungeTestRunner { when (case.handled) { true -> assertLinkHandled(case, handler) false -> assertLinkNotHandled(case, handler) + else -> { + + } } } diff --git a/plunge/build.gradle b/plunge/build.gradle index 006ac41..3958475 100644 --- a/plunge/build.gradle +++ b/plunge/build.gradle @@ -36,9 +36,9 @@ ext { dependencies { // External dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - testImplementation 'junit:junit:4.12' - testImplementation 'org.amshove.kluent:kluent:1.48' - testImplementation 'org.amshove.kluent:kluent-android:1.48' + testImplementation 'junit:junit:4.13.2' + testImplementation 'org.amshove.kluent:kluent:1.68' + testImplementation 'org.amshove.kluent:kluent-android:1.68' // Roboelectric required for unit testing Uri usages - testImplementation 'org.robolectric:robolectric:4.2' + testImplementation 'org.robolectric:robolectric:4.8.1' } diff --git a/sample/build.gradle b/sample/build.gradle index 4331865..2990bb9 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -30,7 +30,7 @@ android { targetSdkVersion project.ext.compile_sdk versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -63,15 +63,15 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'com.google.android.material:material:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation project(':plunge') testImplementation project(':plunge-test') testImplementation project(':plunge-parsing') - testImplementation 'junit:junit:4.12' - testImplementation 'org.robolectric:robolectric:4.2' + testImplementation 'junit:junit:4.13.2' + testImplementation 'org.robolectric:robolectric:4.8.1' testImplementation 'com.nhaarman:mockito-kotlin-kt1.1:1.5.0' } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index a5a9d48..8c43334 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -12,8 +12,9 @@ tools:ignore="AllowBackup,GoogleAppIndexingWarning"> + android:name=".MainActivity" + android:exported="true" + android:windowSoftInputMode="adjustResize">