From 93c6c3d22a1cf8c3bc82fef4f9fb92ac2fd6e79a Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 8 Jan 2019 00:30:38 -0500 Subject: Add acceptable idea files --- .gitignore | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d741202..f19a651 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -*.iml -/.idea .gradle /crowdin.properties /local.properties @@ -7,4 +5,29 @@ /build /captures .externalNativeBuild -**/public.xml \ No newline at end of file +**/public.xml + +# Intellij +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +*.iml +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf +.idea/**/contentModel.xml +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml +.idea/**/gradle.xml +.idea/**/libraries +.idea/**/assetWizardSettings.xml +.idea/**/caches +.idea/modules.xml +.idea/modules \ No newline at end of file -- cgit v1.2.3 From 35d88ea61f9fa46afa141b5ea36ffe830133ebe3 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 11 Mar 2019 00:28:56 -0400 Subject: Update versions --- .gitignore | 2 -- .../src/main/groovy/ca/allanwang/kau/Versions.groovy | 18 ++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 3 ++- sample/build.gradle | 5 +---- .../kotlin/ca/allanwang/kau/sample/MainActivity.kt | 14 ++++---------- 5 files changed, 17 insertions(+), 25 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index f19a651..ef20a58 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,6 @@ # Intellij # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff *.iml .idea/**/workspace.xml .idea/**/tasks.xml diff --git a/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy b/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy index 4afec82..0774be1 100644 --- a/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy +++ b/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy @@ -24,13 +24,13 @@ class Versions { static def constraintLayout = '1.1.3' // https://kotlinlang.org/docs/reference/using-gradle.html - static def kotlin = '1.3.11' + static def kotlin = '1.3.21' // https://github.com/Kotlin/kotlinx.coroutines/releases - static def coroutines = '1.1.0' + static def coroutines = '1.1.1' // https://github.com/mikepenz/AboutLibraries/releases - static def aboutLibraries = '6.2.0' + static def aboutLibraries = '6.2.3' // https://github.com/wasabeef/Blurry/releases static def blurry = '2.1.1' @@ -40,7 +40,7 @@ class Versions { static def fastAdapterCommons = fastAdapter // https://github.com/bumptech/glide/releases - static def glide = '4.8.0' + static def glide = '4.9.0' // https://github.com/mikepenz/Android-Iconics#1-provide-the-gradle-dependency static def iconics = '3.1.0' @@ -64,15 +64,17 @@ class Versions { static def testRules = '1.1.1' // https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md - static def spotless = '3.17.0' + static def spotless = '3.18.0' // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google - static def gradlePlugin = '3.2.1' + static def gradlePlugin = '3.3.1' + // https://github.com/dcendents/android-maven-gradle-plugin/releases static def mavenPlugin = '2.1' - static def playPublishPlugin = '1.2.2' + // https://github.com/Triple-T/gradle-play-publisher/releases + static def playPublishPlugin = '2.1.0' // https://github.com/KeepSafe/dexcount-gradle-plugin/releases - static def dexCountPlugin = '0.8.5' + static def dexCountPlugin = '0.8.6' // https://github.com/gladed/gradle-android-git-version/releases static def gitVersionPlugin = '0.4.7' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a4163a..bc32def 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Mar 11 00:19:22 EDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index e9e5a2e..7316f1e 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -4,11 +4,8 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'com.github.triplet.play' play { - jsonFile = file('../files/gplay-keys.json') + serviceAccountCredentials = file('../files/gplay-keys.json') track = 'beta' - errorOnSizeLimit = true - uploadImages = false - untrackOld = true } android { diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt index 25b5c16..fccba05 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt @@ -15,12 +15,11 @@ */ package ca.allanwang.kau.sample -import android.content.Context import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem -import ca.allanwang.kau.about.AboutActivityBase +import ca.allanwang.kau.about.kauLaunchAbout import ca.allanwang.kau.email.sendEmail import ca.allanwang.kau.kpref.activity.CoreAttributeContract import ca.allanwang.kau.kpref.activity.KPrefActivity @@ -242,10 +241,10 @@ class MainActivity : KPrefActivity() { onClick = { itemView.context.materialDialog { title("Type Text") - input("Type here", item.pref, { _, input -> + input("Type here", item.pref) { _, input -> item.pref = input.toString() reloadSelf() - }) + } inputRange(0, 20) } } @@ -319,9 +318,4 @@ class MainActivity : KPrefActivity() { REQUEST_MEDIA -> toast("${kauOnMediaPickerResult(resultCode, data).size} items selected") } } -} - -inline fun Context.kauLaunchAbout() = - startActivity(bundleBuilder = { - withSceneTransitionAnimation(this@kauLaunchAbout) - }) +} \ No newline at end of file -- cgit v1.2.3