From 7391d0812fd570fd0dbc904fbfe9db97115cd416 Mon Sep 17 00:00:00 2001 From: Vibin Reddy Date: Mon, 20 Aug 2018 19:54:02 +0530 Subject: [PATCH] Change JVM compilation target from 1.8 to 1.6 This lets Android apps to use the library. Also, upgrade Kotlin to v1.2.60. --- build.gradle | 6 +++--- time-android/build.gradle | 2 +- time/build.gradle | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 3a8f653..96ceb9c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.1.51' + ext.kotlin_version = '1.2.60' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' classpath 'com.palantir:jacoco-coverage:0.4.0' @@ -20,4 +20,4 @@ allprojects { } } -apply plugin: 'com.palantir.jacoco-full-report' \ No newline at end of file +apply plugin: 'com.palantir.jacoco-full-report' diff --git a/time-android/build.gradle b/time-android/build.gradle index bffd896..960b744 100644 --- a/time-android/build.gradle +++ b/time-android/build.gradle @@ -33,6 +33,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation project(':time') } diff --git a/time/build.gradle b/time/build.gradle index da88116..5c8ed79 100644 --- a/time/build.gradle +++ b/time/build.gradle @@ -6,13 +6,13 @@ group = 'com.github.kizitonwose' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' } compileKotlin { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "1.6" } compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "1.6" }