Upgrade stately to Kotlin 1.3.40 + AGP to 3.4.1 (#11)

* Upgrade to 1.3.40 (#3)
touchlab · Jun 20, 2019 · e1fe999 · e1fe999
1 parent 2fd4a84
commit e1fe999
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/Sample/app/build.gradle b/Sample/app/build.gradle
@@ -41,7 +41,9 @@ kotlin {
         // This preset is for iPhone emulator
         // Switch here to presets.iosArm64 (or iosArm32) to build library for iPhone device
         fromPreset(presets.iosX64, 'ios') {
-            compilations.main.outputKinds('FRAMEWORK')
+            binaries {
+                framework()
+            }
         }
     }
     sourceSets {
@@ -111,4 +113,4 @@ task copyFramework {
             include 'app.framework.dSYM'
         }
     }
-}
+}
diff --git a/Sample/build.gradle b/Sample/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@
 
 kotlin.code.style=official
 
-KOTLIN_VERSION=1.3.30
+KOTLIN_VERSION=1.3.40
 
 GROUP=co.touchlab
 VERSION_NAME=0.7.2
@@ -36,4 +36,4 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=kpgalligan
 POM_DEVELOPER_NAME=Kevin Galligan
 POM_DEVELOPER_ORG=Kevin Galligan
-POM_DEVELOPER_URL=https://touchlab.co/
+POM_DEVELOPER_URL=https://touchlab.co/
diff --git a/memtest/build.gradle b/memtest/build.gradle
@@ -9,11 +9,13 @@ kotlin {
     // For MacOS, should be changed to e.g. macosX64
     // For Windows, should be changed to e.g. mingwX64
     macosX64("macos") {
-        compilations.main {
+        binaries {
             // Comment to generate Kotlin/Native library (KLIB) instead of executable file:
-            outputKinds("executable")
-            // Change to specify fully qualified name of your application's entry point:
-            entryPoint 'sample.main'
+            executable([RELEASE, DEBUG]) {
+                compilation = compilations.main
+                // Change to specify fully qualified name of your application's entry point:
+                entryPoint 'sample.main'
+            }
         }
     }
 
@@ -32,7 +34,7 @@ kotlin {
 
 task runProgram {
     def buildType = 'DEBUG' // Change to 'DEBUG' to run application with debug symbols.
-    dependsOn kotlin.targets.macos.compilations.main.linkTaskName('EXECUTABLE', buildType)
+    dependsOn kotlin.targets.macos.binaries.getExecutable(buildType).linkTask
     doLast {
         def programFile = kotlin.targets.macos.compilations.main.getBinary('EXECUTABLE', buildType)
         exec {
@@ -45,4 +47,4 @@ task runProgram {
 String OS_NAME = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
 if(OS_NAME.contains("mac") || OS_NAME.contains("darwin")) {
 //    tasks.build.dependsOn runProgram
-}
+}