diff --git a/build.gradle b/build.gradle index b5715bd..6664f7b 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ allprojects { } def appName() { - return "奥乐云桌面" + return "AoleyunLauncher3" } def releaseTime() { @@ -84,9 +84,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } -//签名 + + //签名 signingConfigs { - zhanRui { + alldocube { storeFile file("src/doc/zhanxun.keystore") storePassword "123456" keyAlias "zhanxun" @@ -95,46 +96,40 @@ android { v2SigningEnabled true } - debug { - storeFile file("src/doc/xueshibaoos.jks") + alldocubeDebug { + storeFile file("src/doc/zhanxunUserdebug.keystore") storePassword "123456" - keyAlias "xueshibaoos" + keyAlias "zhanxunUserdebug" keyPassword "123456" - v2SigningEnabled false - } - - release {// 签名文件 - storeFile file("src/doc/xueshibaoos.jks") - storePassword "123456" - keyAlias "xueshibaoos" - keyPassword "123456" - v2SigningEnabled false + v1SigningEnabled true + v2SigningEnabled true } } buildTypes { - zhanRuiRelease.initWith(release) - zhanRuiRelease { - buildConfigField "String", "platform", '"ZhanRui"' - signingConfig signingConfigs.zhanRui - } - - zhanRuiDebug.initWith(debug) - zhanRuiDebug { - versionNameSuffix "-debug" + alldocubeDebug.initWith(debug) + alldocubeDebug { buildConfigField "String", "platform", '"ZhanRui"' debuggable true - signingConfig signingConfigs.zhanRui + versionNameSuffix "-debug" + signingConfig signingConfigs.alldocubeDebug + } + + alldocubeDebugReleas.initWith(release) + alldocubeDebugReleas { + buildConfigField "String", "platform", '"ZhanRui"' + signingConfig signingConfigs.alldocubeDebug } debug { - buildConfigField "String", "platform", '"MTK"' + buildConfigField "String", "platform", '"ZhanRui"' + debuggable true versionNameSuffix "-debug" minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //Zipalign优化 zipAlignEnabled true - signingConfig signingConfigs.debug + signingConfig signingConfigs.alldocube applicationVariants.all { variant -> variant.outputs.each { output -> def outputFile = output.outputFile @@ -147,7 +142,7 @@ android { } release { - buildConfigField "String", "platform", '"MTK"' + buildConfigField "String", "platform", '"ZhanRui"' //混淆 minifyEnabled false //前一部分代表系统默认的android程序的混淆文件,该文件已经包含了基本的混淆声明,后一个文件是自己的定义混淆文件 @@ -155,7 +150,7 @@ android { //Zipalign优化 zipAlignEnabled true //签名 - signingConfig signingConfigs.release + signingConfig signingConfigs.alldocube //将release版本的包名重命名,加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> @@ -169,7 +164,6 @@ android { } } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle index 88508c2..38f48a7 100644 --- a/iconloaderlib/build.gradle +++ b/iconloaderlib/build.gradle @@ -13,13 +13,11 @@ android { } buildTypes { - zhanRuiRelease.initWith(release) - zhanRuiRelease { + alldocubeDebug { minifyEnabled false } - zhanRuiDebug.initWith(debug) - zhanRuiDebug { + alldocubeDebugReleas { minifyEnabled false } debug { diff --git a/settings.gradle b/settings.gradle index 85d4ae6..ef4aa03 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ include ':IconLoader' project(':IconLoader').projectDir = new File(rootDir, 'iconloaderlib') -rootProject.name='奥乐云桌面' \ No newline at end of file +rootProject.name='酷比桌面' \ No newline at end of file diff --git a/src/doc/xueshibaoos.jks b/src/doc/xueshibaoos.jks deleted file mode 100644 index b94a626..0000000 Binary files a/src/doc/xueshibaoos.jks and /dev/null differ diff --git a/src/doc/zhanxunUserdebug.keystore b/src/doc/zhanxunUserdebug.keystore new file mode 100644 index 0000000..6d8f9ee Binary files /dev/null and b/src/doc/zhanxunUserdebug.keystore differ