Skip to content

Commit

Permalink
Update kotlin version
Browse files Browse the repository at this point in the history
  • Loading branch information
npurushe committed Oct 29, 2018
1 parent 5f5d723 commit 036b9c3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -7,15 +7,15 @@ buildscript {
ext.android_support_version = '26.1.0' ext.android_support_version = '26.1.0'
ext.jackson_version = '2.8.6' ext.jackson_version = '2.8.6'
ext.jpa_version = '2.1.1' ext.jpa_version = '2.1.1'
ext.kotlin_version = '1.2.20' ext.kotlin_version = '1.2.71'
ext.rxjava2_version = '2.1.9' ext.rxjava2_version = '2.1.9'
ext.reactor_version = '3.1.4.RELEASE' ext.reactor_version = '3.1.4.RELEASE'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.8" classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.8"
Expand Down
32 changes: 16 additions & 16 deletions requery-test/build.gradle
Expand Up @@ -18,28 +18,28 @@ targetCompatibility = 1.7


dependencies { dependencies {
compile project(':requery') compile project(':requery')
testCompile project(':requery-jackson') testImplementation project(':requery-jackson')
apt project(':requery-processor') apt project(':requery-processor')
compile fileTree(include: ['*.jar'], dir: 'libs') // for Oracle JDBC drivers //compile fileTree(include: ['*.jar'], dir: 'libs') // for Oracle JDBC drivers
compile "io.reactivex.rxjava2:rxjava:$rxjava2_version" compile "io.reactivex.rxjava2:rxjava:$rxjava2_version"
testCompile "io.projectreactor:reactor-core:$reactor_version" testImplementation "io.projectreactor:reactor-core:$reactor_version"
compile "org.eclipse.persistence:javax.persistence:$jpa_version" compile "org.eclipse.persistence:javax.persistence:$jpa_version"
compileOnly 'com.google.auto.value:auto-value:1.2' compileOnly 'com.google.auto.value:auto-value:1.5.2'
apt 'com.google.auto.value:auto-value:1.2' apt 'com.google.auto.value:auto-value:1.5.2'
compileOnly 'org.immutables:value:2.4.3' compileOnly 'org.immutables:value:2.4.3'
apt 'org.immutables:value:2.4.3' apt 'org.immutables:value:2.4.3'
testCompile fileTree(include: ['*.jar'], dir: 'test-libs') //testImplementation fileTree(include: ['*.jar'], dir: 'test-libs')
testCompile 'org.openjdk.jmh:jmh-core:1.12' testImplementation 'org.openjdk.jmh:jmh-core:1.12'
testApt 'org.openjdk.jmh:jmh-generator-annprocess:1.12' testApt 'org.openjdk.jmh:jmh-generator-annprocess:1.12'
testCompile 'mysql:mysql-connector-java:6.0.3' testImplementation 'mysql:mysql-connector-java:6.0.3'
testCompile 'org.postgresql:postgresql:9.4.1209.jre7' testImplementation 'org.postgresql:postgresql:9.4.1209.jre7'
testCompile 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8' testImplementation 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8'
testCompile 'org.xerial:sqlite-jdbc:3.8.11.2' testImplementation 'org.xerial:sqlite-jdbc:3.8.11.2'
testCompile 'org.apache.derby:derby:10.12.1.1' testImplementation 'org.apache.derby:derby:10.12.1.1'
testCompile 'com.h2database:h2:1.4.192' testImplementation 'com.h2database:h2:1.4.197'
testCompile 'org.hsqldb:hsqldb:2.3.4' testImplementation 'org.hsqldb:hsqldb:2.3.4'
testCompile 'org.ehcache:ehcache:3.1.1' testImplementation 'org.ehcache:ehcache:3.1.1'
testCompile 'javax.cache:cache-api:1.0.0' testImplementation 'javax.cache:cache-api:1.0.0'
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile 'junit:junit:4.12' compile 'junit:junit:4.12'
} }
Expand Down

0 comments on commit 036b9c3

Please sign in to comment.