diff options
author | Allan Wang <me@allanwang.ca> | 2020-02-18 00:59:18 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-18 00:59:18 -0800 |
commit | 4d5aaf541dbfa7d521ebbc5f011a642c83c4b9c5 (patch) | |
tree | 76b340fe12c674191be56f951bd8847a066503bb | |
parent | bed9c89993d7a0a8cd37b24c3afb492c1c1ea992 (diff) | |
parent | 0fb77fc887c1754573e7b34ea1c01b4b3556f62f (diff) | |
download | frost-4d5aaf541dbfa7d521ebbc5f011a642c83c4b9c5.tar.gz frost-4d5aaf541dbfa7d521ebbc5f011a642c83c4b9c5.tar.bz2 frost-4d5aaf541dbfa7d521ebbc5f011a642c83c4b9c5.zip |
Merge pull request #1644 from AllanWang/versions
Versions
-rw-r--r-- | app/build.gradle | 14 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt | 9 | ||||
-rw-r--r-- | buildSrc/src/main/kotlin/Versions.kt | 14 | ||||
-rw-r--r-- | gradle.properties | 2 |
4 files changed, 10 insertions, 29 deletions
diff --git a/app/build.gradle b/app/build.gradle index d9f02d1a..f36aa430 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -226,8 +226,6 @@ repositories { } dependencies { - implementation 'androidx.exifinterface:exifinterface:1.0.0' - androidTestImplementation kau.Dependencies.kotlinTest androidTestImplementation kau.Dependencies.espresso androidTestImplementation kau.Dependencies.testRules @@ -264,9 +262,9 @@ dependencies { implementation "androidx.biometric:biometric:${Versions.andxBiometric}" - implementation "org.koin:koin-android:${Versions.koin}" - testImplementation "org.koin:koin-test:${Versions.koin}" - androidTestImplementation "org.koin:koin-test:${Versions.koin}" + implementation kau.Dependencies.koin + testImplementation kau.Dependencies.koinTest + androidTestImplementation kau.Dependencies.koinTest // androidTestImplementation "io.mockk:mockk:${Versions.mockk}" @@ -285,13 +283,7 @@ dependencies { //noinspection GradleDependency kapt kau.Dependencies.glideKapt - //noinspection GradleDependency - releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanary}" - //noinspection GradleDependency - releaseTestImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanary}" - //noinspection GradleDependency debugImplementation "com.squareup.leakcanary:leakcanary-android:${Versions.leakCanary}" -// testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanary}" //Icons implementation kau.Dependencies.iconicsMaterial diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt index 684c54a4..a11006e2 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt @@ -41,20 +41,11 @@ import org.koin.core.context.startKoin */ class FrostApp : Application() { -// companion object { -// fun refWatcher(c: Context) = (c.applicationContext as FrostApp).refWatcher -// } - -// lateinit var refWatcher: RefWatcher - override fun onCreate() { if (!buildIsLollipopAndUp) { // not supported super.onCreate() return } - -// if (LeakCanary.isInAnalyzerProcess(this)) return -// refWatcher = LeakCanary.install(this) initPrefs() initBugsnag() diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index fb7d764e..75544cfb 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -3,26 +3,24 @@ object Versions { const val targetSdk = 29 // https://developer.android.com/jetpack/androidx/releases/biometric - const val andxBiometric = "1.0.0" + const val andxBiometric = "1.0.1" // https://mvnrepository.com/artifact/org.apache.commons/commons-text // Updates blocked due to javax.script dependency const val apacheCommonsText = "1.4" // https://github.com/brianwernick/ExoMedia/releases const val exoMedia = "4.3.0" - // https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md - const val koin = "2.0.1" // https://github.com/mockk/mockk/releases const val mockk = "1.9.3" // https://github.com/jhy/jsoup/releases const val jsoup = "1.12.1" - // https://github.com/square/leakcanary/releases - const val leakCanary = "1.6.2" - // https://github.com/square/okhttp/releases - const val okhttp = "4.2.2" + // https://square.github.io/leakcanary/changelog/ + const val leakCanary = "2.2" + // https://square.github.io/okhttp/changelog/ + const val okhttp = "4.3.1" // https://developer.android.com/jetpack/androidx/releases/room - const val room = "2.2.2" + const val room = "2.2.3" // http://robolectric.org/getting-started/ const val roboelectric = "4.3" // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start diff --git a/gradle.properties b/gradle.properties index a94983c0..bc29a7b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=cfac5f0 +KAU=e4bba6f android.useAndroidX=true android.enableJetifier=true |