Kotlin 1.3.40 (#52)

* Initial try to support Kotlin 1.3.40 * Use easy-kotlin-mpp-gradle-plugin:0.1.1 * Bump version * Try to not include android.components * Try to accept android licenses * Try to specify licenses * Fullpath of sdkmanager * Try additional fix * Do not use sdkmanager as it seems to not be available * Do not call jsTestChrome since it doesn't exists now * Try to use bionic * Try to install libstdc++6 * Try to use addons.apt.packages instead of apt-get install * strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX * Try to update-upgrade and install libstdc++6 (the lastest is GLIBCXX_3.4.16, so GLIBCXX_3.4.17 is missing) $ strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX GLIBCXX_3.4 GLIBCXX_3.4.1 GLIBCXX_3.4.2 GLIBCXX_3.4.3 GLIBCXX_3.4.4 GLIBCXX_3.4.5 GLIBCXX_3.4.6 GLIBCXX_3.4.7 GLIBCXX_3.4.8 GLIBCXX_3.4.9 GLIBCXX_3.4.10 GLIBCXX_3.4.11 GLIBCXX_3.4.12 GLIBCXX_3.4.13 GLIBCXX_3.4.14 GLIBCXX_3.4.15 GLIBCXX_3.4.16 GLIBCXX_DEBUG_MESSAGE_LENGTH * Try to use xenial (bionic didn't work without noticing) * Try to force -y * Try to use trusty (14.04) instead of xenial (16.04) just in case xenial is not supported on android and it is forced to precise (12.04) * Do not call upgrade * Try to reorganize travis.yml
soywiz-archive · Jun 24, 2019 · 42a221b · 42a221b
1 parent 50f2b6b
commit 42a221b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,34 @@
 matrix:
   include:
-  - os: linux
-    language: android
+  - language: android
+    dist: trusty
+    addons:
+      apt:
+        update: true
+        packages:
+          - libstdc++6
     android:
       components:
         - build-tools-28.0.3
         - android-28
+      licenses:
+        - 'android-sdk-preview-license-52d11cd2'
+        - 'android-sdk-license-.+'
+        - 'google-gdk-license-.+'
     jdk: oraclejdk8
     env:
       KBUILD=linux-chrome-android
       JAVA_OPTS=-Xmx2g
+    before_install:
+      - mkdir "$ANDROID_HOME/licenses" || true && echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
+      - ls -la /usr/local/android-sdk/tools/bin/ || true
+      - sudo apt-get update -y
+      #- sudo apt-get upgrade -y
+      - sudo apt-get install -y libstdc++6
+      - strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX
+      #- yes | /usr/local/android-sdk/tools/bin/sdkmanager --licenses
     script:
-    - ./gradlew -s -i assemble check jsTestChrome lint testDebugUnitTest
+    - ./gradlew -s -i assemble check lint testDebugUnitTest
   - os: windows
     env: KBUILD=windows
     language: shell # java is not supported but jdk is installed

diff --git a/README.md b/README.md
@@ -65,3 +65,11 @@ dependencies {
     implementation "com.soywiz.korlibs.klock:klock-jvm:$klockVersion"
 }
 ```
+
+### Versions
+
+| Klock  | Kotlin | Gradle Metadata  |
+|--------|--------|------------------|
+| 1.5.0  | 1.3.40 | 1.0              |
+| 1.4.0  | 1.3.21 | 1.0              |
+
diff --git a/build.gradle b/build.gradle
@@ -9,11 +9,6 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.soywiz.korlibs:easy-kotlin-mpp-gradle-plugin:0.0.6"
+        classpath "com.soywiz.korlibs:easy-kotlin-mpp-gradle-plugin:0.1.1" // Kotlin 1.3.40: https://github.com/korlibs/easy-kotlin-mpp-gradle-plugin
     }
 }
-
-//// Also published on plugins.gradle.org
-//plugins {
-//    id "com.soywiz.korlibs.easy-kotlin-mpp-gradle-plugin" version "0.0.3" apply false
-//}
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style=official
 
 # version
 group=com.soywiz.korlibs.klock
-version=1.4.0
+version=1.5.0
 
 # bintray location
 project.bintray.org=korlibs