aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/codeStyles/Project.xml25
-rw-r--r--.idea/encodings.xml4
-rw-r--r--.idea/misc.xml2
-rw-r--r--buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy12
-rw-r--r--files/translation_migration.sh2
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
6 files changed, 14 insertions, 35 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0290b2f..be6976d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -13,31 +13,6 @@
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
- <Objective-C-extensions>
- <file>
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
- </file>
- <class>
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
- </class>
- <extensions>
- <pair source="cpp" header="h" fileNamingConvention="NONE" />
- <pair source="c" header="h" fileNamingConvention="NONE" />
- </extensions>
- </Objective-C-extensions>
<XML>
<option name="XML_KEEP_LINE_BREAKS" value="false" />
<option name="XML_ALIGN_ATTRIBUTES" value="false" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project> \ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cc04cd3..51fa3e5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -35,7 +35,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy b/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy
index 0774be1..a50a7a0 100644
--- a/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy
+++ b/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy
@@ -24,16 +24,16 @@ class Versions {
static def constraintLayout = '1.1.3'
// https://kotlinlang.org/docs/reference/using-gradle.html
- static def kotlin = '1.3.21'
+ static def kotlin = '1.3.31'
// https://github.com/Kotlin/kotlinx.coroutines/releases
- static def coroutines = '1.1.1'
+ static def coroutines = '1.2.1'
// https://github.com/mikepenz/AboutLibraries/releases
static def aboutLibraries = '6.2.3'
// https://github.com/wasabeef/Blurry/releases
- static def blurry = '2.1.1'
+ static def blurry = '3.0.0'
// https://github.com/mikepenz/FastAdapter#using-maven
static def fastAdapter = '3.3.1'
@@ -43,10 +43,10 @@ class Versions {
static def glide = '4.9.0'
// https://github.com/mikepenz/Android-Iconics#1-provide-the-gradle-dependency
- static def iconics = '3.1.0'
+ static def iconics = '3.2.5'
static def iconicsGoogle = '3.0.1.3'
static def iconicsMaterial = '2.2.0.5'
- static def iconicsCommunity = '2.7.94.1'
+ static def iconicsCommunity = '3.5.95.1'
// https://github.com/afollestad/material-dialogs/releases
static def materialDialog = '0.9.6.0'
@@ -67,7 +67,7 @@ class Versions {
static def spotless = '3.18.0'
// https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
- static def gradlePlugin = '3.3.1'
+ static def gradlePlugin = '3.4.1'
// https://github.com/dcendents/android-maven-gradle-plugin/releases
static def mavenPlugin = '2.1'
// https://github.com/Triple-T/gradle-play-publisher/releases
diff --git a/files/translation_migration.sh b/files/translation_migration.sh
index aabd2f8..d1372d1 100644
--- a/files/translation_migration.sh
+++ b/files/translation_migration.sh
@@ -15,4 +15,4 @@ else
find . -type d -empty -delete
fi
-echo "Finished cleaning files" \ No newline at end of file
+echo "Finished cleanieckng files" \ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bc32def..9fccf04 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 11 00:19:22 EDT 2019
+#Tue May 21 11:47:57 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip