Sfoglia il codice sorgente

Upgrade to Kotlin 1.2.60.

Yao Wei Tjong 姚伟忠 7 anni fa
parent
commit
af5fbde01e

+ 2 - 2
android/launcher-app/src/main/java/com/github/urho3d/launcher/LauncherActivity.kt

@@ -59,8 +59,8 @@ class LauncherActivity : ExpandableListActivity() {
                 arrayOf("api", "info"),
                 intArrayOf(android.R.id.text1, android.R.id.text2),
                 items.map {
-                    it.value.map {
-                        mapOf("item" to it)
+                    it.value.map { name ->
+                        mapOf("item" to name)
                     }
                 },
                 R.layout.launcher_list_item,

+ 0 - 1
android/launcher-app/src/main/java/com/github/urho3d/launcher/MainActivity.kt

@@ -23,7 +23,6 @@
 package com.github.urho3d.launcher
 
 import com.github.urho3d.UrhoActivity
-import java.util.*
 
 class MainActivity : UrhoActivity() {
 

+ 3 - 3
android/urho3d-lib/build.gradle.kts

@@ -116,12 +116,12 @@ afterEvaluate {
     }
 
     // This is a hack - workaround Android plugin for Gradle not providing way to bundle extra "stuffs"
-    android.buildTypes.forEach {
-        val config = it.name.capitalize()
+    android.buildTypes.forEach { buildType ->
+        val config = buildType.name.capitalize()
         tasks {
             create<Zip>("zipBuildTree$config") {
                 val aarDir = File(buildDir, "outputs/aar")
-                val aarName = "${project.name}-${it.name}.aar"
+                val aarName = "${project.name}-${buildType.name}.aar"
                 val aarFile = File(aarDir, aarName)
                 archiveName = "$aarName.new"
                 destinationDir = aarDir

+ 1 - 1
build.gradle.kts

@@ -26,7 +26,7 @@ plugins {
 
 buildscript {
     var kotlinVersion: String by extra
-    kotlinVersion = "1.2.51"
+    kotlinVersion = "1.2.60"
     repositories {
         google()
         jcenter()