Browse Source

Updated kotlin, gradle and android plugin

Vadik Sirekanyan 4 years ago
parent
commit
ef2b6c948a

+ 4 - 6
app/build.gradle.kts

@@ -18,11 +18,9 @@ android {
         versionCode = 31
         versionName = "0.3.4"
         setProperty("archivesBaseName", "$applicationId-$versionName-$versionCode")
-        manifestPlaceholders = mapOf(
-            "LOGIN_CALLBACK_SCHEME" to "e270636c0efc6cad95130113d3bbafc3",
-            "LOGIN_CALLBACK_HOST" to "532b8e7fc54c52b6df5b55181acc241a",
-            "LOGIN_CALLBACK_PATH" to "$versionCode"
-        )
+        manifestPlaceholders["LOGIN_CALLBACK_SCHEME"] = "e270636c0efc6cad95130113d3bbafc3"
+        manifestPlaceholders["LOGIN_CALLBACK_HOST"] = "532b8e7fc54c52b6df5b55181acc241a"
+        manifestPlaceholders["LOGIN_CALLBACK_PATH"] = "$versionCode"
         manifestPlaceholders.forEach { (key, value) ->
             buildConfigField("String", key, "\"$value\"")
         }
@@ -96,7 +94,7 @@ task("updateReadme") {
         }
         rootProject.file("README.md").printWriter().use { readme ->
             rootProject.file("readme.md").forEachLine { inputLine ->
-                readme.appendln(
+                readme.appendLine(
                     properties.entries.fold(inputLine) { line, (key, value) ->
                         line.replace("{{$key}}", value.orEmpty())
                     }

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/common/extensions/String.kt

@@ -8,7 +8,7 @@ val RANDOM_ID = Array(16) { Random.nextInt(0, 16).toString(16) }.joinToString(""
 
 private val HTTP_SCHEMES = setOf("http", "https")
 
-val String.lowercase get() = toLowerCase(Locale.getDefault())
+val String.lowercase get() = lowercase(Locale.getDefault())
 
 fun String.orDefault(default: String) = if (isEmpty()) default else this
 

+ 4 - 4
build.gradle.kts

@@ -1,17 +1,17 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
+        classpath("com.android.tools.build:gradle:7.0.4")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }

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

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists