Update libs

Author: koji-1009

build.gradle

@@ -2,24 +2,19 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.3.72'
+        kotlin_version = '1.4.30'
     }
     ext.versions = [
-            'compileSdk'      : 29,
-            'minSdk'          : 21,
-            'targetSdk'       : 29,
-            'annotation'      : '1.1.0',
-            'appcompat'       : '1.1.0',
-            'constraintLayout': '1.1.3',
-            'junit'           : '4.13',
-            'robolectric'     : '4.3.1'
+            'compileSdk': 29,
+            'minSdk'    : 21,
+            'targetSdk' : 29,
     ]
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -28,7 +23,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
     }
 }
 

gradle.properties

@@ -15,7 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri May 29 10:30:00 JST 2020
+#Wed Feb 24 17:00:00 JST 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-all.zip

sdk-example-java/build.gradle

@@ -11,7 +11,6 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
@@ -32,14 +31,12 @@ repositories {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation "androidx.appcompat:appcompat:$versions.appcompat"
-    implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
+    implementation project(":studyplus-android-sdk")
 
-    implementation 'com.github.studyplus:Studyplus-Android-SDK:2.6.2'
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-    testImplementation "junit:junit:$versions.junit"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation "junit:junit:4.13"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

sdk-example-kt/build.gradle

@@ -1,9 +1,6 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
 
-apply plugin: 'kotlin-android-extensions'
-
 android {
     compileSdkVersion versions.compileSdk
     defaultConfig {
@@ -26,19 +23,13 @@ android {
     }
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:$versions.appcompat"
-    implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
+    implementation project(":studyplus-android-sdk")
 
-    implementation 'com.github.studyplus:Studyplus-Android-SDK:2.6.2'
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-    testImplementation "junit:junit:$versions.junit"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation "junit:junit:4.13"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

studyplus-android-sdk/build.gradle

@@ -7,8 +7,6 @@ android {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
 
-        consumerProguardFiles 'lib-proguard-rules.txt'
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -38,15 +36,13 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    implementation "androidx.annotation:annotation:$versions.annotation"
+    implementation "androidx.annotation:annotation:1.1.0"
 
-    def okhttp = "4.7.2"
-    implementation "com.squareup.okhttp3:okhttp:$okhttp"
+    implementation platform("com.squareup.okhttp3:okhttp-bom:4.9.1")
+    implementation "com.squareup.okhttp3:okhttp"
 
-    testImplementation "junit:junit:$versions.junit"
-    testImplementation "org.robolectric:robolectric:$versions.robolectric"
+    testImplementation "junit:junit:4.13"
+    testImplementation "org.robolectric:robolectric:4.3.1"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
-    testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp"
+    testImplementation "com.squareup.okhttp3:mockwebserver"
 }