Skip to content

Commit 49c34ea

Browse files
committed
Moved back to recent version of kotlin
1 parent cd34099 commit 49c34ea

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

annotationprocessor/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@ def source_GIT_COMMIT = new File(buildDir, 'generated/source/GIT_COMMIT/main/jav
1717

1818
dependencies {
1919
implementation fileTree(dir: 'libs', include: ['*.jar'])
20+
21+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
22+
2023
implementation project(':annotations')
2124
implementation "io.realm:realm-annotations:$realm_version"
2225

2326
kapt "com.google.auto.service:auto-service:1.0-rc2" // don't update yet, won't auto generate code
2427
compileOnly "com.google.auto.service:auto-service:1.0-rc2" // don't update yet, won't auto generate code
2528

2629
implementation 'com.squareup:javapoet:1.9.0'
27-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
2830
}
2931

3032
repositories {

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.1.51'
4+
ext.kotlin_version = '1.2.0'
55
ext.realm_version = '4.3.1'
66
ext.sdk_version = 25
77
ext.build_tools_version = '26.0.2'
@@ -14,9 +14,9 @@ buildscript {
1414

1515
dependencies {
1616
classpath 'com.android.tools.build:gradle:3.0.1'
17+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1718
classpath "io.realm:realm-gradle-plugin:$realm_version"
1819
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' // jitpack.io
19-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2020

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

query/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232

3333
dependencies {
3434
implementation fileTree(include: ['*.jar'], dir: 'libs')
35-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
35+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
3636
compileOnly "com.android.support:support-annotations:$support_library_version"
3737
compileOnly "io.realm:realm-android-library:$realm_version"
3838
}

0 commit comments

Comments
 (0)