From 852e3a9bd94d396b53a50fe3b0af7e474ca022f6 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 --- .../app/build.gradle | 20 +++++++++++++------ InteractiveSliceProviderKotlin/build.gradle | 8 +++----- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- SliceViewerKotlin/app/build.gradle | 17 +++++++++------- SliceViewerKotlin/build.gradle | 8 ++++---- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 35 insertions(+), 26 deletions(-) diff --git a/InteractiveSliceProviderKotlin/app/build.gradle b/InteractiveSliceProviderKotlin/app/build.gradle index 9d7340076..8053f13ac 100644 --- a/InteractiveSliceProviderKotlin/app/build.gradle +++ b/InteractiveSliceProviderKotlin/app/build.gradle @@ -13,6 +13,14 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } } buildTypes { release { @@ -25,8 +33,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "androidx.appcompat:appcompat:1.0.2" - implementation "androidx.core:core-ktx:1.0.1" + implementation "androidx.appcompat:appcompat:1.1.0" + implementation "androidx.core:core-ktx:1.2.0" // The slice builder ktx library has a number of dependencies. For reference, since this is a // slice sample, below are a list of the slice dependencies: @@ -35,10 +43,10 @@ dependencies { implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha6" implementation "androidx.constraintlayout:constraintlayout:1.1.3" - implementation "com.google.firebase:firebase-appindexing:17.1.0" - testImplementation "junit:junit:4.12" - androidTestImplementation "androidx.test:runner:1.1.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.1.1" + implementation "com.google.firebase:firebase-appindexing:19.1.0" + testImplementation "junit:junit:4.13" + androidTestImplementation "androidx.test:runner:1.2.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0" } apply plugin: "com.google.gms.google-services" diff --git a/InteractiveSliceProviderKotlin/build.gradle b/InteractiveSliceProviderKotlin/build.gradle index 20acdf270..dff13383e 100644 --- a/InteractiveSliceProviderKotlin/build.gradle +++ b/InteractiveSliceProviderKotlin/build.gradle @@ -1,17 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.0' + ext.kotlin_version = '1.3.61' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.2.0' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.google.gms:google-services:4.3.3' } } diff --git a/InteractiveSliceProviderKotlin/gradle/wrapper/gradle-wrapper.properties b/InteractiveSliceProviderKotlin/gradle/wrapper/gradle-wrapper.properties index f3e238e39..6d59a2db2 100644 --- a/InteractiveSliceProviderKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/InteractiveSliceProviderKotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu May 24 23:16:35 PDT 2018 +#Wed Feb 19 12:27:54 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 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