From b60d77d10bd4d82fc4296dca665b3d6e8d492b9a Mon Sep 17 00:00:00 2001 From: limuyang Date: Tue, 23 Aug 2022 12:02:30 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0Gradle=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 ++--- app/src/main/AndroidManifest.xml | 3 ++- .../res/drawable/brvah_sample_footer_loading.png | Bin .../brvah_sample_footer_loading_progress.xml | 0 build.gradle | 4 ++-- gradle.properties | 2 -- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 7 ++----- 8 files changed, 10 insertions(+), 15 deletions(-) rename {library => app}/src/main/res/drawable/brvah_sample_footer_loading.png (100%) rename {library => app}/src/main/res/drawable/brvah_sample_footer_loading_progress.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index bc7d56c1c..6143a41c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,13 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 - buildToolsVersion "30.0.3" + compileSdkVersion 31 defaultConfig { applicationId "com.chad.baserecyclerviewadapterhelper" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 31 versionCode 9 versionName "3.0" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1088dd50d..613f93793 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,8 @@ android:theme="@style/AppTheme" android:name=".MyApplication" tools:ignore="GoogleAppIndexingWarning"> - + diff --git a/library/src/main/res/drawable/brvah_sample_footer_loading.png b/app/src/main/res/drawable/brvah_sample_footer_loading.png similarity index 100% rename from library/src/main/res/drawable/brvah_sample_footer_loading.png rename to app/src/main/res/drawable/brvah_sample_footer_loading.png diff --git a/library/src/main/res/drawable/brvah_sample_footer_loading_progress.xml b/app/src/main/res/drawable/brvah_sample_footer_loading_progress.xml similarity index 100% rename from library/src/main/res/drawable/brvah_sample_footer_loading_progress.xml rename to app/src/main/res/drawable/brvah_sample_footer_loading_progress.xml diff --git a/build.gradle b/build.gradle index 466da53d3..b0e674a81 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = '1.6.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle.properties b/gradle.properties index 380a718be..91530d67f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,5 @@ #Wed Feb 26 13:11:31 CST 2020 android.enableJetifier=true org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" -android.buildCacheDir=./build/buildCache/ android.useAndroidX=true android.enableD8=true -android.enableBuildCache=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 50aa0f6d1..a4574a4f6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Nov 14 15:55:02 CST 2021 +#Tue Aug 23 11:54:38 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index c59154eeb..91d51e93e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 28 - buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 14 @@ -21,7 +20,7 @@ android { } } compileOptions { - kotlinOptions.freeCompilerArgs += ['-module-name', "com.github.CymChad.brvah"] + kotlinOptions.freeCompilerArgs += ['-module-name', "com.github.CymChad.brvah", "-Xjvm-default=all"] } lintOptions { @@ -43,9 +42,7 @@ task sourcesJar(type: Jar) { } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.annotation:annotation:1.2.0' - compileOnly 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.2.1' }