From 10d0dabdfcdab519ed2aa86fbab4eec063a0e2c4 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Wed, 21 Oct 2026 11:36:48 +0800 Subject: [PATCH] =?UTF-8?q?version:1.6.1016=20fix:=E5=8D=87=E7=BA=A7AGP?= =?UTF-8?q?=E8=87=B38.13.2=E5=8F=8ABuildTools=2036.0.0=20add:=E9=85=8D?= =?UTF-8?q?=E7=BD=AEnamespace=E4=B8=8E=E4=BE=9D=E8=B5=96=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E3=80=81=E7=BB=9F=E4=B8=80=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=81=E8=B0=83=E6=95=B4=E7=AD=BE=E5=90=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 168 +++++++++++++++++++------------------ gradle.properties | 6 +- iconloaderlib/build.gradle | 2 + src/doc/sm8150.jks | Bin 0 -> 2427 bytes 4 files changed, 90 insertions(+), 86 deletions(-) create mode 100644 src/doc/sm8150.jks diff --git a/build.gradle b/build.gradle index 356a26d..462b1a7 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,14 @@ buildscript { repositories { mavenCentral() google() + maven { url 'https://jitpack.io' } + maven { url 'https://maven.google.com' } + maven { url 'https://developer.huawei.com/repo/' } + maven { url 'https://developer.hihonor.com/repo' } + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/jcenter' } + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } } dependencies { classpath GRADLE_CLASS_PATH @@ -10,6 +18,31 @@ buildscript { } allprojects { + configurations.all { + resolutionStrategy { + force 'androidx.constraintlayout:constraintlayout:2.0.4' + force 'androidx.core:core:1.5.0' + + //for targetSdkVersion 29 + force 'androidx.activity:activity:1.2.2' + force 'androidx.lifecycle:lifecycle-livedata:2.3.1' + force 'androidx.lifecycle:lifecycle-livedata-core:2.3.1' + force 'androidx.lifecycle:lifecycle-runtime:2.3.1' + force 'androidx.lifecycle:lifecycle-viewmodel:2.3.1' + force 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1' + force 'androidx.lifecycle:lifecycle-service:2.3.1' + force 'androidx.lifecycle:lifecycle-process:2.3.1' + force 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' + force 'androidx.savedstate:savedstate:1.1.0' + force 'androidx.profileinstaller:profileinstaller:1.1.0' + force 'androidx.startup:startup-runtime:1.0.0' + force 'androidx.arch.core:core-runtime:2.1.0' + force 'androidx.sqlite:sqlite:2.1.0' + force 'androidx.sqlite:sqlite-framework:2.1.0' + force 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' + } + } + gradle.projectsEvaluated { tasks.withType(JavaCompile) { options.compilerArgs.add('-Xbootclasspath/p:libs/framework.jar') @@ -32,24 +65,7 @@ apply plugin: 'com.android.application' apply plugin: 'com.google.protobuf' android { - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - Set fileSet = options.bootstrapClasspath.getFiles() - List newFileList = new ArrayList<>(); - //JAVA语法，可连续调用，输入参数建议为相对路径 - newFileList.add(new File("libs/framework.jar")) - //最后将原始参数添加 - newFileList.addAll(fileSet) - options.bootstrapClasspath = files( - newFileList.toArray() - ) - } - } - - lintOptions { - checkReleaseBuilds false - abortOnError false - } + namespace "com.aoleyun.os" compileSdkVersion COMPILE_SDK buildToolsVersion BUILD_TOOLS_VERSION @@ -57,13 +73,20 @@ android { defaultConfig { minSdkVersion 26 targetSdkVersion 28 - versionCode 6 - versionName "1.5" + versionCode 216 + versionName "1.6.1016" + ndk { //选择要添加的对应 cpu 类型的 .so 库。 abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' } + + lintOptions { + checkReleaseBuilds false + abortOnError false + } + manifestPlaceholders = [ JPUSH_PKGNAME: "com.aoleyun.os", JPUSH_APPKEY : "0c7ba5a1622dba78d5bd00cc", //JPush 上注册的包名对应的 Appkey. @@ -73,7 +96,19 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } -//签名 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + dataBinding true + buildConfig true + aidl true + } + + //签名 signingConfigs { zhanRui { storeFile file("src/doc/zhanxun.keystore") @@ -84,7 +119,7 @@ android { v2SigningEnabled true } - debug { + mtk { storeFile file("src/doc/xueshibaoos.jks") storePassword "123456" keyAlias "xueshibaoos" @@ -92,12 +127,13 @@ android { v2SigningEnabled false } - release {// 签名文件 - storeFile file("src/doc/xueshibaoos.jks") - storePassword "123456" - keyAlias "xueshibaoos" - keyPassword "123456" - v2SigningEnabled false + SM8150 { + storeFile file("src/doc/sm8150.jks") + storePassword "logan-123456789" + keyAlias "platformkey" + keyPassword "logan-123456789" + v1SigningEnabled true + v2SigningEnabled true } } @@ -118,50 +154,28 @@ android { debug { buildConfigField "String", "platform", '"MTK"' - versionNameSuffix "-debug" + versionNameSuffix "_debug" minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - //Zipalign优化 - zipAlignEnabled true - signingConfig signingConfigs.debug - applicationVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null) { - def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" - output.outputFileName = fileName - } - } - } + signingConfig signingConfigs.SM8150 } release { buildConfigField "String", "platform", '"MTK"' - //混淆 minifyEnabled false - //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - //Zipalign优化 - zipAlignEnabled true - //签名 - signingConfig signingConfigs.release - //将release版本的包名重命名，加上版本及日期 - applicationVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = "" - if (outputFile != null) { - def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" - output.outputFileName = fileName - } - } - } + signingConfig signingConfigs.SM8150 } } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + android.applicationVariants.all { variant -> + variant.outputs.all { output -> // 改为 all + def buildType = variant.buildType.name + if (buildType.contains("debug")) { + outputFileName = "${appName()}_V${defaultConfig.versionName}_${releaseTime()}.apk" + } else { + outputFileName = "${appName()}_${variant.versionCode}_V${variant.versionName}_${releaseTime()}_${buildType}.apk" + } + } } // The flavor dimensions for build variants (e.g. aospWithQuickstep, aospWithoutQuickstep) @@ -312,8 +326,8 @@ dependencies { //mmkv implementation 'com.tencent:mmkv-static:1.2.10' //极光推送 - implementation 'cn.jiguang.sdk:jpush:3.8.6' // 此处以JPush 3.8.6 版本为例。 - implementation 'cn.jiguang.sdk:jcore:2.6.0' // 此处以JCore 2.6.0 版本为例。 + implementation 'cn.jiguang.sdk:jpush:3.8.5' // 此处以JPush 3.8.6 版本为例。 + implementation 'cn.jiguang.sdk:jcore:2.7.8' // 此处以JCore 2.6.0 版本为例。 //下载 implementation 'me.laoyuyu.aria:core:3.8.16' annotationProcessor 'me.laoyuyu.aria:compiler:3.8.16' @@ -321,26 +335,14 @@ dependencies { implementation 'com.blankj:utilcodex:1.30.6' } -preBuild { - doLast { - def imlFile = file(project.name + ".iml") - println 'Change ' + project.name + '.iml order' - try { - def parsedXml = (new XmlParser()).parse(imlFile) - def jdkNode = parsedXml.component[1].orderEntry.find { it.'@type' == 'jdk' } - parsedXml.component[1].remove(jdkNode) - def sdkString = "Android API " + android.compileSdkVersion.substring("android-".length()) + " Platform" - println 'what' + sdkString - new Node(parsedXml.component[1], 'orderEntry', ['type': 'jdk', 'jdkName': sdkString, 'jdkType': 'Android SDK']) - groovy.xml.XmlUtil.serialize(parsedXml, new FileOutputStream(imlFile)) - } catch (FileNotFoundException e) { - // nop, iml not found - println "no iml found" - } +// 在 dependencies 之后添加 +project.afterEvaluate { + android.applicationVariants.all { variant -> + variant.javaCompileProvider.get().options.bootstrapClasspath = files( + file('libs/framework.jar'), + android.getBootClasspath() + ) } - //https://www.pianshen.com/article/93481144911/ - //https://blog.csdn.net/dhl_1986/article/details/102856026 - //使用系统编译后的framework.jar } protobuf { diff --git a/gradle.properties b/gradle.properties index a4831f6..349e4a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ android.enableJetifier = true ANDROID_X_VERSION=1.0.0-beta01 -GRADLE_CLASS_PATH=com.android.tools.build:gradle:3.3.0 +GRADLE_CLASS_PATH=com.android.tools.build:gradle:8.13.2 -PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.8.8 +PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.9.4 PROTOBUF_DEPENDENCY=com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7 -BUILD_TOOLS_VERSION=28.0.3 +BUILD_TOOLS_VERSION=36.0.0 COMPILE_SDK=android-29 \ No newline at end of file diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle index 88508c2..022574f 100644 --- a/iconloaderlib/build.gradle +++ b/iconloaderlib/build.gradle @@ -1,6 +1,8 @@ apply plugin: 'com.android.library' android { + namespace "com.aoleyun.os.icons" + compileSdkVersion COMPILE_SDK buildToolsVersion BUILD_TOOLS_VERSION publishNonDefault true diff --git a/src/doc/sm8150.jks b/src/doc/sm8150.jks new file mode 100644 index 0000000000000000000000000000000000000000..ecf3b325babf97de4a9fd31336b3a26df594ac1c GIT binary patch literal 2427 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 DorNCl literal 0 HcmV?d00001