update dependencies to latest

lytefast · Oct 25, 2020 · 2fce53e · 2fce53e
1 parent 1fb6bc6
commit 2fce53e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -37,15 +37,17 @@ Used in the [Discord](https://discordapp.com) android app!
 For more details refer to the sample app included in this project.
 
 ## Gradle
+See how to include the depedency via [Jitpack](https://jitpack.io/#lytefast/flex-input)
+You can find `release_version`s on the [release page](https://github.com/lytefast/flex-input/releases)
+
 ```gradle
 repositories {
-    jcenter()
-    google()
-    maven { url 'http://dl.bintray.com/lytefast/android' }
+    ...
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
-    implementation "com.lytefast:flexinput:0.9.18@aar"
+    implementation 'com.github.lytefast:flex-input:{release_version}}'
     implementation "com.camerakit:camerakit:$cameraKitVersion"
     implementation "com.camerakit:jpegkit:$cameraKitJpegKitVersion"
 }

diff --git a/app/build.gradle b/app/build.gradle
@@ -24,11 +24,11 @@ android {
 dependencies {
     implementation project(':flexinput')
 
-    implementation "androidx.annotation:annotation:$androidxVersion"
-    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.annotation:annotation:$androidxAnnotationVersion"
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
     implementation "androidx.core:core:$androidxCoreVersion"
-    implementation "androidx.fragment:fragment:$androidxVersion"
+    implementation "androidx.fragment:fragment:$androidxFragmentVersion"
     implementation "androidx.recyclerview:recyclerview:$androidxRecyclerView"
     implementation "com.google.android.material:material:$materialVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$androidCoroutineVersion"

diff --git a/build.gradle b/build.gradle
@@ -3,35 +3,36 @@
 buildscript {
 
     ext {
-        buildToolsVersion = '28.0.3'
-        compileSdkVersion = 29
-        minSdkVersion = 16
-        targetSdkVersion = 29
+        buildToolsVersion = '30.0.2'
+        compileSdkVersion = 30
+        minSdkVersion = 21
+        targetSdkVersion = 30
 
         // Platform
         espressoCoreVersion = '3.0.1'
-        kotlin_version = '1.3.61'
-        kotlin_coroutine_version = '1.0.0'
-        junitVersion = '4.12'
+        kotlin_version = '1.4.10'
+        kotlin_coroutine_version = '1.3.8'
+        junitVersion = '4.13'
 
         //<editor-fold desc="Android Support Versions">
 
         // Latest versions here: https://developer.android.com/jetpack/androidx/migrate
-        ext.androidxVersion = '1.1.0'
-        ext.androidxCoreVersion = '1.1.0'
-        ext.androidxRecyclerView = '1.1.0-rc01'
-        ext.appCompatVersion = '1.1.0'
-        ext.constraintLayoutVersion = '1.1.3'
-        ext.materialVersion = '1.1.0-rc01'
+        ext.androidxAnnotationVersion = '1.1.0'
+        ext.androidxCoreVersion = '1.3.2'
+        ext.androidxFragmentVersion = '1.2.5'
+        ext.androidxRecyclerView = '1.1.0'
+        ext.androidxAppCompatVersion = '1.2.0'
+        ext.constraintLayoutVersion = '2.0.2'
+        ext.materialVersion = '1.2.1'
         ext.androidCoroutineVersion = '1.3.2'
-        ext.swipeRefreshLayoutVersion = '1.0.0'
+        ext.swipeRefreshLayoutVersion = '1.1.0'
 
         //</editor-fold>
 
         // 3rd party libs
         cameraKitVersion = '1.0.0-beta3.10'
         cameraKitJpegKitVersion = '0.1.0'
-        frescoVersion = '2.0.0'
+        frescoVersion = '2.3.0'
     }
 
     repositories {
@@ -40,7 +41,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/flexinput/build.gradle b/flexinput/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "0.10.8"
+        versionName "0.10.9"
 
         proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
         consumerProguardFiles(
@@ -24,11 +24,11 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version"
 
-    implementation "androidx.annotation:annotation:$androidxVersion"
-    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.annotation:annotation:$androidxAnnotationVersion"
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
-    implementation "androidx.core:core:$androidxCoreVersion"
-    implementation "androidx.fragment:fragment:$androidxVersion"
+    implementation "androidx.core:core-ktx:$androidxCoreVersion"
+    implementation "androidx.fragment:fragment-ktx:$androidxFragmentVersion"
     implementation "androidx.recyclerview:recyclerview:$androidxRecyclerView"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swipeRefreshLayoutVersion"
     implementation "com.google.android.material:material:$materialVersion"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 30 14:25:47 PDT 2019
+#Sat Oct 24 17:29:48 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip