diff --git a/build.gradle b/build.gradle index edd667d..58a4c52 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0-rc03' + classpath 'com.android.tools.build:gradle:3.4.0' // 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 6965ca3..b5d1398 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.9 +proj_version=2.1.10 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 4701b85..d8b7f92 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip diff --git a/kotlinknifer/build.gradle b/kotlinknifer/build.gradle index 0ce1017..a4e97b4 100644 --- a/kotlinknifer/build.gradle +++ b/kotlinknifer/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation "org.jetbrains.anko:anko-commons:0.10.8" implementation "androidx.appcompat:appcompat:1.0.2" implementation "androidx.core:core-ktx:1.0.1" - implementation "androidx.recyclerview:recyclerview:1.1.0-alpha02" + implementation "androidx.recyclerview:recyclerview:1.1.0-alpha04" implementation "androidx.palette:palette:1.0.0" compile project(":kotlinshaver") } diff --git a/sample/build.gradle b/sample/build.gradle index a2e14a0..1f3fbcd 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -17,12 +17,16 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + packagingOptions { + exclude "META-INF/atomicfu.kotlin_module" + exclude "META-INF/kotlinx-coroutines-core.kotlin_module" + } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(':kotlinknifer') // implementation "com.devrapid.jieyi:kotlinknifer:1.4.1"