From bac09da064c5a02dcd8dad29e28b31ea4b94428b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 29 十月 2024 18:05:02 +0800
Subject: [PATCH] 0312 安卓target改28
---
SdkProject/library/build.gradle | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 0fc6fa5..6a5c12e 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -1,6 +1,7 @@
plugins {
id 'com.android.library'
}
+
def rootPath = rootProject.getRootDir().getAbsolutePath()
def channelPath = "${rootPath}/channel/${CHANNEL_NAME}"
@@ -32,18 +33,20 @@
def channelJavaFiles = getAllFiles(new ArrayList<File>(), "${channelPath}/java")
android {
- compileSdkVersion 29
- buildToolsVersion "28.0.1"
+ compileSdkVersion 30
+ buildToolsVersion "30.0.0"
defaultConfig {
minSdkVersion 21
- targetSdkVersion 29
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
+ multiDexEnabled true
}
+
flavorDimensions "version"
productFlavors {
@@ -59,9 +62,10 @@
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
+ packagingOptions {exclude 'META-INF/rxjava.properties'}
lintOptions {
checkReleaseBuilds false
abortOnError false
@@ -180,8 +184,8 @@
}
dependencies {
- implementation 'com.android.support:support-annotations:28.0.0'
- testImplementation 'junit:junit:4.13.2'
+// implementation 'com.android.support:support-annotations:28.0.0'
+// testImplementation 'junit:junit:4.13.2'
//noinspection GradleCompatible
// implementation 'com.android.support:appcompat-v7:28.0.0'
--
Gitblit v1.8.0