From 79b696bdafadd470de02df46f10970287201d88a Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 19 Feb 2020 12:22:05 +0100 Subject: [PATCH] Android Studio 3.5.3 --- SliceViewerKotlin/app/build.gradle | 17 ++++++++++------- SliceViewerKotlin/build.gradle | 8 ++++---- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/SliceViewerKotlin/app/build.gradle b/SliceViewerKotlin/app/build.gradle index bd4c1ed9a..2dbed614b 100644 --- a/SliceViewerKotlin/app/build.gradle +++ b/SliceViewerKotlin/app/build.gradle @@ -8,14 +8,14 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "androidx.lifecycle:lifecycle-runtime:2.0.0" - implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" - implementation "androidx.lifecycle:lifecycle-common:2.0.0" + implementation "androidx.lifecycle:lifecycle-runtime:2.2.0" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + implementation "androidx.lifecycle:lifecycle-common:2.2.0" implementation "androidx.slice:slice-view:1.1.0-alpha01" implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha6" - implementation "androidx.appcompat:appcompat:1.0.0" + implementation "androidx.appcompat:appcompat:1.1.0" implementation "androidx.cardview:cardview:1.0.0" - implementation "androidx.core:core-ktx:1.0.0" + implementation "androidx.core:core-ktx:1.2.0" implementation 'androidx.constraintlayout:constraintlayout:1.1.3' } @@ -31,7 +31,10 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 } } diff --git a/SliceViewerKotlin/build.gradle b/SliceViewerKotlin/build.gradle index b9c6c7048..0103e8819 100644 --- a/SliceViewerKotlin/build.gradle +++ b/SliceViewerKotlin/build.gradle @@ -1,19 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.3.61' repositories { - jcenter() google() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } allprojects { repositories { - jcenter() google() + jcenter() } } \ No newline at end of file diff --git a/SliceViewerKotlin/gradle/wrapper/gradle-wrapper.properties b/SliceViewerKotlin/gradle/wrapper/gradle-wrapper.properties index fd6b29dfb..4d26b5ad8 100644 --- a/SliceViewerKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/SliceViewerKotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 12 10:02:08 PDT 2018 +#Wed Feb 19 12:20:02 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip