diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6081f76..7837e2f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,8 +33,8 @@ tasks.register("genDocs") { android { - compileSdk = 34 - buildToolsVersion = "34.0.0" + compileSdk = 35 + buildToolsVersion = "35.0.0" namespace = "com.fredhappyface.ewesticker" kotlinOptions { @@ -72,21 +72,21 @@ android { } dependencies { - dokkaPlugin("org.jetbrains.dokka:android-documentation-plugin:1.9.20") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.23") - implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.11.0") + dokkaPlugin("org.jetbrains.dokka:android-documentation-plugin:2.0.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.10") + implementation("androidx.core:core-ktx:1.15.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.12.0") implementation("androidx.preference:preference-ktx:1.2.1") - implementation("io.coil-kt:coil:2.6.0") - implementation("io.coil-kt:coil-gif:2.6.0") - implementation("io.coil-kt:coil-video:2.6.0") + implementation("io.coil-kt:coil:2.7.0") + implementation("io.coil-kt:coil-gif:2.7.0") + implementation("io.coil-kt:coil-video:2.7.0") implementation("androidx.gridlayout:gridlayout:1.0.0") implementation("io.noties.markwon:core:4.6.2") androidTestImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test:core:1.5.0") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test:core:1.6.1") + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") } configure { diff --git a/app/src/androidTest/java/com/fredhappyface/ewesticker/ScreenshotTest.kt b/app/src/androidTest/java/com/fredhappyface/ewesticker/ScreenshotTest.kt index 2119a0b..5dfa209 100644 --- a/app/src/androidTest/java/com/fredhappyface/ewesticker/ScreenshotTest.kt +++ b/app/src/androidTest/java/com/fredhappyface/ewesticker/ScreenshotTest.kt @@ -106,8 +106,10 @@ class ScreenshotTest { // Open an OutputStream to the newly created image val os: OutputStream? = context.contentResolver.openOutputStream(uri) - // Compress and save the bitmap to the OutputStream - bitmap.compress(Bitmap.CompressFormat.JPEG, 100, os) + // Compress and save the bitmap to the OutputStream\ + if (os != null) { + bitmap.compress(Bitmap.CompressFormat.JPEG, 100, os) + } os?.close() // Mark the image as non-pending diff --git a/app/src/test/java/com/fredhappyface/ewesticker/ExampleUnitTest.kt b/app/src/test/java/com/fredhappyface/ewesticker/ExampleUnitTest.kt deleted file mode 100644 index ca8515b..0000000 --- a/app/src/test/java/com/fredhappyface/ewesticker/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.fredhappyface.ewesticker - -import org.hamcrest.MatcherAssert.assertThat -import org.hamcrest.Matchers.`is` -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertThat(2 + 2, `is`(4)) - } -} diff --git a/build.gradle.kts b/build.gradle.kts index 42201df..c51fced 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id("com.android.application") version "8.5.2" apply false - id("org.jetbrains.kotlin.android") version "1.9.0" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false id("org.jetbrains.dokka") version "1.9.20" id("org.jlleitschuh.gradle.ktlint") version "11.6.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92789a4..9a37995 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 21 23:12:37 GMT 2024 +#Sat Feb 08 15:53:44 GMT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists