From 722a8fff38c84aa9ff042a8ced757cf5c1a0a7e1 Mon Sep 17 00:00:00 2001 From: Steven Schoen Date: Mon, 24 Jun 2019 16:07:24 -0700 Subject: [PATCH] Upgrade dependencies (#12) --- gradle.properties | 1 - indicator-fast-scroll/build.gradle | 12 +++++++----- sample/build.gradle | 7 +++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8de5058..7f69adb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,6 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/indicator-fast-scroll/build.gradle b/indicator-fast-scroll/build.gradle index 20d04df..ccb5b1d 100644 --- a/indicator-fast-scroll/build.gradle +++ b/indicator-fast-scroll/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -def libraryVersionName = '1.1.0-beta1' +def libraryVersionName = '1.1.0' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName libraryVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -18,7 +18,9 @@ android { // TODO replace with https://issuetracker.google.com/issues/72050365 once released. libraryVariants.all { - it.generateBuildConfig.enabled = false + it.generateBuildConfigProvider.configure { task -> + task.enabled = false + } } } @@ -30,7 +32,7 @@ dependencies { implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.core:core-ktx:1.0.1' + implementation 'androidx.core:core-ktx:1.0.2' testImplementation "androidx.test.ext:junit:1.1.1" testImplementation 'androidx.test:rules:1.2.0' diff --git a/sample/build.gradle b/sample/build.gradle index e87fc79..b95e36a 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "com.reddit.indicatorfastscroll.sample" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -22,7 +21,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.core:core-ktx:1.0.1' + implementation 'androidx.core:core-ktx:1.0.2' implementation 'com.thedeanda:lorem:2.1' }