From c235d91c70fe44b977d6ee3edf0202f654044a44 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 24 Oct 2021 17:53:57 -0700 Subject: Update kau --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 34a34940..d1b07e3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=e2ac8e3 +KAU=222709b android.useAndroidX=true android.enableJetifier=true -- cgit v1.2.3 From ab7447c811808568cc7367eef3149aead2d990b3 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 24 Oct 2021 18:30:11 -0700 Subject: Version bumps, koin removal, android 12 target --- app/build.gradle | 3 -- .../kotlin/com/pitchedapps/frost/FrostTestApp.kt | 19 -------- .../com/pitchedapps/frost/db/DatabaseTest.kt | 53 ---------------------- app/src/main/AndroidManifest.xml | 9 ++-- buildSrc/src/main/kotlin/Versions.kt | 8 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- spotless.gradle | 3 +- 7 files changed, 12 insertions(+), 85 deletions(-) delete mode 100644 app/src/androidTest/kotlin/com/pitchedapps/frost/db/DatabaseTest.kt diff --git a/app/build.gradle b/app/build.gradle index d80f8ff8..8779069a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -274,9 +274,6 @@ dependencies { implementation "androidx.biometric:biometric:${Versions.andxBiometric}" - testImplementation kau.Dependencies.koinTest - androidTestImplementation kau.Dependencies.koinTest - implementation kau.Dependencies.hilt kapt kau.Dependencies.hiltCompiler testImplementation kau.Dependencies.hiltTest diff --git a/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt b/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt index 2a834cc8..021e9c1f 100644 --- a/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt +++ b/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt @@ -19,13 +19,7 @@ package com.pitchedapps.frost import android.app.Application import android.content.Context import androidx.test.runner.AndroidJUnitRunner -import com.pitchedapps.frost.prefs.Prefs import dagger.hilt.android.testing.HiltTestApplication -import org.junit.rules.TestRule -import org.junit.runner.Description -import org.junit.runners.model.Statement -import org.koin.core.component.KoinComponent -import org.koin.core.component.get class FrostTestRunner : AndroidJUnitRunner() { override fun newApplication( @@ -36,16 +30,3 @@ class FrostTestRunner : AndroidJUnitRunner() { return super.newApplication(cl, HiltTestApplication::class.java.name, context) } } - -class FrostTestRule : TestRule { - override fun apply(base: Statement, description: Description): Statement = - object : Statement(), KoinComponent { - override fun evaluate() { - - // Reset prefs - get().reset() - - base.evaluate() - } - } -} diff --git a/app/src/androidTest/kotlin/com/pitchedapps/frost/db/DatabaseTest.kt b/app/src/androidTest/kotlin/com/pitchedapps/frost/db/DatabaseTest.kt deleted file mode 100644 index 49d18b31..00000000 --- a/app/src/androidTest/kotlin/com/pitchedapps/frost/db/DatabaseTest.kt +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2019 Allan Wang - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.pitchedapps.frost.db - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.junit.runner.RunWith -import org.koin.core.error.NoBeanDefFoundException -import org.koin.test.KoinTest -import kotlin.reflect.KClass -import kotlin.reflect.full.functions -import kotlin.test.Test -import kotlin.test.assertTrue - -@RunWith(AndroidJUnit4::class) -class DatabaseTest : KoinTest { - - inline fun hasKoin() = hasKoin(T::class) - - fun hasKoin(klazz: KClass): Boolean = - try { - getKoin().get(klazz, qualifier = null, parameters = null) - true - } catch (e: NoBeanDefFoundException) { - false - } - - /** - * Database and all daos should be loaded as components - */ - @Test - fun testKoins() { - hasKoin() - val members = FrostDatabase::class.java.kotlin.functions.filter { it.name.endsWith("Dao") } - .mapNotNull { it.returnType.classifier as? KClass<*> } - assertTrue(members.isNotEmpty(), "Failed to find dao interfaces") - val missingKoins = members.filter { !hasKoin(it) } - assertTrue(missingKoins.isEmpty(), "Missing koins: $missingKoins") - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 62cf57e9..dfdc9706 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ @@ -174,14 +174,17 @@ + android:enabled="true" + android:exported="false"> - + diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 00ea0589..5c68a01d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,6 @@ object Versions { - const val targetSdk = 30 + const val targetSdk = 31 // https://developer.android.com/jetpack/androidx/releases/biometric const val andxBiometric = "1.1.0" @@ -12,15 +12,15 @@ object Versions { const val exoMedia = "4.3.0" // https://github.com/jhy/jsoup/releases - const val jsoup = "1.14.2" + const val jsoup = "1.14.3" // https://square.github.io/okhttp/changelog/ const val okhttp = "4.9.1" // https://developer.android.com/jetpack/androidx/releases/room const val room = "2.3.0" // http://robolectric.org/getting-started/ - const val roboelectric = "4.4" + const val roboelectric = "4.6" // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start const val scaleImageView = "3.10.0" // https://github.com/node-gradle/gradle-node-plugin/releases - const val nodeGradle = "3.0.1" + const val nodeGradle = "3.1.1" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1acc777d..a0f7639f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spotless.gradle b/spotless.gradle index 72104ac0..6ff39f3c 100644 --- a/spotless.gradle +++ b/spotless.gradle @@ -3,8 +3,7 @@ apply plugin: "com.diffplug.spotless" spotless { kotlin { target "**/*.kt" - // https://github.com/pinterest/ktlint/releases - ktlint("0.41.0").userData(["disabled_rules": "no-wildcard-imports"]) + ktlint(kau.Versions.ktlint).userData(["disabled_rules": "no-wildcard-imports"]) licenseHeaderFile '../spotless.license.kt' trimTrailingWhitespace() endWithNewline() -- cgit v1.2.3 From 68397505810095136cac25382d93ca9b910d38c9 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 18 Nov 2021 14:29:48 -0800 Subject: Update kau --- .idea/misc.xml | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 88df0bd7..bade46b1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -44,7 +44,7 @@ - + diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 00ea0589..e33e32df 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,7 +12,7 @@ object Versions { const val exoMedia = "4.3.0" // https://github.com/jhy/jsoup/releases - const val jsoup = "1.14.2" + const val jsoup = "1.14.3" // https://square.github.io/okhttp/changelog/ const val okhttp = "4.9.1" // https://developer.android.com/jetpack/androidx/releases/room diff --git a/gradle.properties b/gradle.properties index 34a34940..8fa730c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=e2ac8e3 +KAU=a9b8b69a android.useAndroidX=true android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1acc777d..a0f7639f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3 From c59734cab54c15874383bc4a2066984d3966169c Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 18 Nov 2021 15:39:38 -0800 Subject: Use release kau build --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index bade46b1..c17036ff 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -44,7 +44,7 @@ - + diff --git a/gradle.properties b/gradle.properties index 8fa730c4..ee36bd78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=a9b8b69a +KAU=6.4.0 android.useAndroidX=true android.enableJetifier=true -- cgit v1.2.3