feat: updated SimpleMultipartUpload to Kotlin 1.4.32. Stopped using j…

…center. Removed kotlin android extensions. Updated all dependencies.
gotev · Jun 5, 2021 · 15e457f · 15e457f
1 parent c37d9bd
commit 15e457f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 26 deletions.
diff --git a/examples/SimpleMultipartUpload/app/build.gradle b/examples/SimpleMultipartUpload/app/build.gradle
@@ -1,18 +1,14 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
 
-apply plugin: 'kotlin-android-extensions'
-
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
     defaultConfig {
         applicationId "it.gotev.testapp"
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 30
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -26,14 +22,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    def uploadServiceVersion = "4.1.0"
+    def uploadServiceVersion = "4.5.5"
 
     implementation "net.gotev:uploadservice:$uploadServiceVersion"
 }
diff --git a/examples/SimpleMultipartUpload/app/src/main/java/it/gotev/testapp/MainActivity.kt b/examples/SimpleMultipartUpload/app/src/main/java/it/gotev/testapp/MainActivity.kt
@@ -3,8 +3,8 @@ package it.gotev.testapp
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.activity_main.*
 import net.gotev.uploadservice.protocols.multipart.MultipartUploadRequest
 
 class MainActivity : AppCompatActivity() {
@@ -19,7 +19,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        uploadButton.setOnClickListener {
+        findViewById<Button>(R.id.uploadButton).setOnClickListener {
             pickFile()
         }
     }

diff --git a/examples/SimpleMultipartUpload/build.gradle b/examples/SimpleMultipartUpload/build.gradle
@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.0'
+    ext.kotlin_version = '1.4.32'
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,8 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
 }
 

diff --git a/examples/SimpleMultipartUpload/gradle/wrapper/gradle-wrapper.properties b/examples/SimpleMultipartUpload/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Sat Nov 23 11:38:22 CET 2019
+#Sat Jun 05 10:33:42 CEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip