Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump kotlin version to 1.4.3 #7017

Merged
merged 3 commits into from Mar 9, 2021
Merged

Bump kotlin version to 1.4.3 #7017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf5bdea
Bump kotlin version to 1.4.3 (multithreaded)
mrousavy Mar 9, 2021
ecba0a1
Bump core-KTX to 1.3.2
mrousavy Mar 9, 2021
5197d5c
Use normal JRE Kotlin instead of Kotlin/Native
mrousavy Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions autolink/postlink/gradleLinker.js
View file
Open in desktop
@@ -1,9 +1,9 @@
// @ts-check
var path = require('./path');
var fs = require('fs');
var {warnn, errorn, logn, infon, debugn} = require('./log');
var {insertString} = require('./stringUtils');
var DEFAULT_KOTLIN_VERSION = '1.3.61';
var { warnn, errorn, logn, infon, debugn } = require('./log');
var { insertString } = require('./stringUtils');
var DEFAULT_KOTLIN_VERSION = '1.4.31';
// This should be the minSdkVersion required for RNN.
var DEFAULT_MIN_SDK_VERSION = 21;

Expand Down
5 changes: 2 additions & 3 deletions lib/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ def DEFAULT_MIN_SDK_VERSION = 19
def DEFAULT_TARGET_SDK_VERSION = 29
def kotlinVersion = rootProject.ext.get("RNNKotlinVersion")
def kotlinStdlib = safeExtGet('RNNKotlinStdlib', 'kotlin-stdlib-jdk8')
def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.3.7')
def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.4.3')

android {
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
Expand Down Expand Up @@ -170,9 +170,8 @@ allprojects { p ->
}

dependencies {
implementation "androidx.core:core-ktx:1.3.0"
implementation "androidx.core:core-ktx:1.3.2"
implementation "org.jetbrains.kotlin:$kotlinStdlib:$kotlinVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesCore"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore"
implementation "androidx.constraintlayout:constraintlayout:2.0.4"

Expand Down
4 changes: 2 additions & 2 deletions lib/android/build.gradle
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext {
RNNKotlinVersion = '1.3.61'
RNNKotlinVersion = '1.4.31'
}

repositories {
Expand All @@ -13,7 +13,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down