Browse Source

Compatible with the latest version of Android Studio Iguana 🚀🎉

An An 1 year ago
parent
commit
3613b04e1b

+ 2 - 2
build.gradle.kts

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -18,7 +18,7 @@ plugins {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven(url = "https://jitpack.io")
     }
 }

+ 2 - 2
buildSrc/src/main/java/Constants.kt

@@ -9,8 +9,8 @@ object AndroidConstants {
 }
 
 object Versions {
-    const val build_gradle_version = "4.0.1"
-    const val kotlin_gradle_plugin_version = "1.4.10"
+    const val build_gradle_version = "7.4.1"
+    const val kotlin_gradle_plugin_version = "1.9.23"
     const val bintray_plugin_version = "1.8.5"
 
     const val bintray_version = "1.8.5"

+ 1 - 2
charts/build.gradle.kts

@@ -1,12 +1,11 @@
 plugins {
     id("com.android.library")
     kotlin("android")
-    kotlin("android.extensions")
 }
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

+ 7 - 1
charts/src/main/java/com/github/aachartmodel/aainfographics/aachartcreator/AAOptions.kt

@@ -230,7 +230,9 @@ object AAOptionsConstructor {
                 val aaSeries = aaPlotOptions.series
                 aaSeries?.marker(aaMarker)
             }
-            else -> {}
+            else -> {
+
+            }
         }
     }
 
@@ -358,6 +360,10 @@ object AAOptionsConstructor {
 
                 aaOptions.yAxis(aaYAxis)
             }
+
+            else -> {
+                
+            }
         }
     }
 }

+ 1 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Apr 01 20:07:26 WEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 8 - 1
sample/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
 
@@ -24,6 +23,14 @@ android {
         lintOptions {
             abortOnError false
         }
+
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_1_8
+            targetCompatibility = JavaVersion.VERSION_1_8
+        }
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
     }
 }