Skip to content

Commit 077c5f3

Browse files
committed
update library and SDK versions
1 parent e98ed4b commit 077c5f3

4 files changed

Lines changed: 19 additions & 10 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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.41'
4+
ext.kotlin_version = '1.4.10'
55
repositories {
66
google()
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.4.2'
10+
classpath 'com.android.tools.build:gradle:4.0.1'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1313

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Mar 17 19:46:50 GMT 2018
1+
#Mon Sep 14 16:40:57 CEST 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-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

sample/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 28
6+
compileSdkVersion 29
77
defaultConfig {
88
applicationId "com.transferwise.sequencelayout.sample"
99
minSdkVersion 16
10-
targetSdkVersion 28
10+
targetSdkVersion 29
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -23,5 +23,5 @@ dependencies {
2323
implementation project(':sequencelayout')
2424

2525
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
26-
implementation 'androidx.appcompat:appcompat:1.0.2'
26+
implementation 'androidx.appcompat:appcompat:1.2.0'
2727
}

sequencelayout/build.gradle

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ apply plugin: 'com.github.dcendents.android-maven'
66
group='com.github.transferwise'
77

88
android {
9-
compileSdkVersion 28
9+
compileSdkVersion 29
1010

1111
defaultConfig {
1212
minSdkVersion 16
13-
targetSdkVersion 28
13+
targetSdkVersion 29
1414
versionCode 11
1515
versionName "1.0.11"
1616
archivesBaseName = "com.transferwise.sequencelayout-${versionName}"
@@ -22,9 +22,18 @@ android {
2222
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2323
}
2424
}
25+
26+
compileOptions {
27+
sourceCompatibility = JavaVersion.VERSION_1_8
28+
targetCompatibility = JavaVersion.VERSION_1_8
29+
}
30+
31+
kotlinOptions {
32+
jvmTarget = JavaVersion.VERSION_1_8.toString()
33+
}
2534
}
2635

2736
dependencies {
2837
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29-
implementation 'androidx.appcompat:appcompat:1.0.2'
38+
implementation 'androidx.appcompat:appcompat:1.2.0'
3039
}

0 commit comments

Comments
 (0)