Skip to content
This repository was archived by the owner on Jul 11, 2025. It is now read-only.

Commit 5c6694c

Browse files
hannesa2hannesa2
committed
Android Studio 3.5.3
1 parent dbf5ae9 commit 5c6694c

6 files changed

Lines changed: 35 additions & 26 deletions

File tree

‎InteractiveSliceProviderKotlin/app/build.gradle‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ android {
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
16+
17+
compileOptions {
18+
sourceCompatibility = JavaVersion.VERSION_1_8
19+
targetCompatibility = JavaVersion.VERSION_1_8
20+
}
21+
kotlinOptions {
22+
jvmTarget = JavaVersion.VERSION_1_8
23+
}
1624
}
1725
buildTypes {
1826
release {
@@ -25,8 +33,8 @@ android {
2533
dependencies {
2634
implementation fileTree(dir: 'libs', include: ['*.jar'])
2735
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
28-
implementation "androidx.appcompat:appcompat:1.0.2"
29-
implementation "androidx.core:core-ktx:1.0.1"
36+
implementation "androidx.appcompat:appcompat:1.1.0"
37+
implementation "androidx.core:core-ktx:1.2.0"
3038

3139
// The slice builder ktx library has a number of dependencies. For reference, since this is a
3240
// slice sample, below are a list of the slice dependencies:
@@ -35,10 +43,10 @@ dependencies {
3543
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha6"
3644

3745
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
38-
implementation "com.google.firebase:firebase-appindexing:17.1.0"
39-
testImplementation "junit:junit:4.12"
40-
androidTestImplementation "androidx.test:runner:1.1.1"
41-
androidTestImplementation "androidx.test.espresso:espresso-core:3.1.1"
46+
implementation "com.google.firebase:firebase-appindexing:19.1.0"
47+
testImplementation "junit:junit:4.13"
48+
androidTestImplementation "androidx.test:runner:1.2.0"
49+
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
4250
}
4351

4452
apply plugin: "com.google.gms.google-services"

‎InteractiveSliceProviderKotlin/build.gradle‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.0'
4+
ext.kotlin_version = '1.3.61'
55
repositories {
66
google()
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.2.1'
10+
classpath 'com.android.tools.build:gradle:3.5.3'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
classpath 'com.google.gms:google-services:4.2.0'
13-
// NOTE: Do not place your application dependencies here; they belong
14-
// in the individual module build.gradle files
12+
classpath 'com.google.gms:google-services:4.3.3'
1513
}
1614
}
1715

‎InteractiveSliceProviderKotlin/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu May 24 23:16:35 PDT 2018
1+
#Wed Feb 19 12:27:54 CET 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip

‎SliceViewerKotlin/app/build.gradle‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ repositories {
88

99
dependencies {
1010
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
11-
implementation "androidx.lifecycle:lifecycle-runtime:2.0.0"
12-
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
13-
implementation "androidx.lifecycle:lifecycle-common:2.0.0"
11+
implementation "androidx.lifecycle:lifecycle-runtime:2.2.0"
12+
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
13+
implementation "androidx.lifecycle:lifecycle-common:2.2.0"
1414
implementation "androidx.slice:slice-view:1.1.0-alpha01"
1515
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha6"
16-
implementation "androidx.appcompat:appcompat:1.0.0"
16+
implementation "androidx.appcompat:appcompat:1.1.0"
1717
implementation "androidx.cardview:cardview:1.0.0"
18-
implementation "androidx.core:core-ktx:1.0.0"
18+
implementation "androidx.core:core-ktx:1.2.0"
1919
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
2020
}
2121

@@ -31,7 +31,10 @@ android {
3131
}
3232

3333
compileOptions {
34-
sourceCompatibility JavaVersion.VERSION_1_7
35-
targetCompatibility JavaVersion.VERSION_1_7
34+
sourceCompatibility = JavaVersion.VERSION_1_8
35+
targetCompatibility = JavaVersion.VERSION_1_8
36+
}
37+
kotlinOptions {
38+
jvmTarget = JavaVersion.VERSION_1_8
3639
}
3740
}

‎SliceViewerKotlin/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.2.71'
3+
ext.kotlin_version = '1.3.61'
44
repositories {
5-
jcenter()
65
google()
6+
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.0'
9+
classpath 'com.android.tools.build:gradle:3.5.3'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
1313

1414
allprojects {
1515
repositories {
16-
jcenter()
1716
google()
17+
jcenter()
1818
}
1919
}

‎SliceViewerKotlin/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jun 12 10:02:08 PDT 2018
1+
#Wed Feb 19 12:20:02 CET 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip

0 commit comments

Comments
 (0)