From ab18545bae7f13d46aeeec725c577fc96b193a0a Mon Sep 17 00:00:00 2001 From: Jieyi Date: Sat, 11 Apr 2020 22:35:55 +0900 Subject: [PATCH] build(*): bump into the newest version --- build.gradle | 6 +++--- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- kotlinknifer/build.gradle | 7 +++++-- kotlinknifer/src/main/AndroidManifest.xml | 2 +- sample/build.gradle | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index bf70f0e..4f5c6b1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' - ext.kotlin_coroutine_version = '1.3.2' + ext.kotlin_version = '1.3.71' + ext.kotlin_coroutine_version = '1.3.5' repositories { jcenter() google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.0.0-beta04' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index 275fc1b..082a078 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ proj_name=kotlinknifer proj_libname=KotlinKnifer proj_group=com.devrapid.jieyi proj_artifactid=kotlinknifer -proj_version=2.1.17 +proj_version=2.1.18 proj_description=For developing an Android conveniently and rapidly. proj_websiteurl=https://github.com/pokk/KotlinKnifer proj_issuetrackerurl=https://github.com/pokk/KotlinKnifer/issues diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c4388a..b7c8c5d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/kotlinknifer/build.gradle b/kotlinknifer/build.gradle index ffb7a53..219b004 100644 --- a/kotlinknifer/build.gradle +++ b/kotlinknifer/build.gradle @@ -14,6 +14,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } } kotlin { @@ -31,8 +34,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutine_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version" implementation "androidx.appcompat:appcompat:1.1.0" - implementation "androidx.core:core-ktx:1.1.0" - implementation "androidx.recyclerview:recyclerview:1.1.0-beta05" + implementation "androidx.core:core-ktx:1.2.0" + implementation "androidx.recyclerview:recyclerview:1.2.0-alpha02" implementation "androidx.palette:palette:1.0.0" api project(":kotlinshaver") } diff --git a/kotlinknifer/src/main/AndroidManifest.xml b/kotlinknifer/src/main/AndroidManifest.xml index a75e2f7..233c7da 100644 --- a/kotlinknifer/src/main/AndroidManifest.xml +++ b/kotlinknifer/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@