fixed kotlin core issue

kamaravichow · Sep 30, 2021 · f7f76f1 · f7f76f1
1 parent 09684a6
commit f7f76f1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,6 +7,9 @@ android {
     compileSdk 30
 
     defaultConfig {
+        configurations.all {
+            resolutionStrategy { force 'androidx.core:core-ktx:1.6.0' }
+        }
         applicationId "me.aravi.ip.example"
         minSdk 21
         targetSdk 30

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.21'
+    ext.kotlin_version = '1.4.32'
     repositories {
         google()
         mavenCentral()

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -23,12 +23,14 @@ project.afterEvaluate {
 
 android {
     compileSdk 30
-
     defaultConfig {
+        configurations.all {
+            resolutionStrategy { force 'androidx.core:core-ktx:1.6.0' }
+        }
         minSdk 21
         targetSdk 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "1.3"
         consumerProguardFiles "consumer-rules.pro"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -52,6 +54,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     implementation "androidx.core:core-ktx:1.6.0"
+    //noinspection GradleDependency
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
 

diff --git a/lib/proguard-rules.pro b/lib/proguard-rules.pro
@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
diff --git a/lib/src/main/java/me/aravi/libraries/iplib/api/GeoLocatorAPI.kt b/lib/src/main/java/me/aravi/libraries/iplib/api/GeoLocatorAPI.kt
@@ -1,17 +1,9 @@
 package me.aravi.libraries.iplib.api
 
-import retrofit2.http.GET
-import me.aravi.libraries.iplib.model.IPInfo
-import me.aravi.libraries.iplib.api.Endpoints
-import me.aravi.libraries.iplib.api.GeoLocatorAPI
-import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import me.aravi.libraries.iplib.api.GeoLocatorAPI
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import androidx.annotation.Keep
-import me.aravi.libraries.iplib.listeners.OnIPResponse
-import android.os.AsyncTask
-import me.aravi.libraries.iplib.IPLib
 
 class GeoLocatorAPI private constructor() {
     val service: Endpoints?

diff --git a/lib/src/main/java/me/aravi/libraries/iplib/model/IPInfo.kt b/lib/src/main/java/me/aravi/libraries/iplib/model/IPInfo.kt
@@ -1,17 +1,6 @@
 package me.aravi.libraries.iplib.model
 
-import retrofit2.http.GET
-import me.aravi.libraries.iplib.model.IPInfo
-import me.aravi.libraries.iplib.api.Endpoints
-import me.aravi.libraries.iplib.api.GeoLocatorAPI
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 import androidx.annotation.Keep
-import me.aravi.libraries.iplib.listeners.OnIPResponse
-import android.os.AsyncTask
-import me.aravi.libraries.iplib.IPLib
 
 @Keep
 class IPInfo {