From fced8a43ec0518a11cfa70bee2c77986f1e13815 Mon Sep 17 00:00:00 2001 From: Angelo Date: Mon, 4 Nov 2019 10:12:00 +0100 Subject: [PATCH] Fix build's compilation error Add Java 8 support to both library and sample project. Bump gradle plugin to the latest stable one: 3.5.1. --- app/build.gradle | 5 +++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 13 +++++++------ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac22b44..fba459e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,6 +9,11 @@ android { versionCode 1 versionName "1.0" } + + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } } dependencies { diff --git a/build.gradle b/build.gradle index 8ffcec1..e0aad39 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0-beta01' + classpath 'com.android.tools.build:gradle:3.5.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b9ab305..5ead196 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 24 11:23:33 CEST 2019 +#Mon Nov 04 10:08:07 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 6e07340..2011ee8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -9,7 +9,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0-beta02' + classpath 'com.android.tools.build:gradle:3.5.1' } } @@ -21,17 +21,18 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } -} -compileOptions { + + compileOptions { sourceCompatibility = '1.8' targetCompatibility = '1.8' + } } dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - androidTestImplementation 'androidx.test:core:1.1.0' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'org.assertj:assertj-core:2.8.0' + androidTestImplementation 'androidx.test:core:1.2.0' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'org.assertj:assertj-core:3.12.2' }