From 0700e40b8402e69ff0f48cc08024a9aa65269f16 Mon Sep 17 00:00:00 2001 From: Godfather <981964879@qq.com> Date: Wed, 2 Mar 2022 14:59:46 +0800 Subject: [PATCH] =?UTF-8?q?version:=20fix:=20update:=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=B0=E9=85=B7=E6=AF=94=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 54 +++++++++++++----------------- iconloaderlib/build.gradle | 6 ++-- settings.gradle | 2 +- src/doc/xueshibaoos.jks | Bin 2552 -> 0 bytes src/doc/zhanxunUserdebug.keystore | Bin 0 -> 2931 bytes 5 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 src/doc/xueshibaoos.jks create mode 100644 src/doc/zhanxunUserdebug.keystore 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 b94a626a1e59b41e0d2b0e1725c1d164b6a8f5ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2552 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 h=~IOHotm-=tG={6OY~?wV#1*=AWE9~~D3^HHXX zwafMKm~lR$?11N@dd52`5{LybUbvzy;7niB66!OuT|~1 zwGgOjFj?;nES!}=*^(N>%{hJc#(}e!_>T9t)pR) zNw?j_M14=a(?_^`^E&^~CS7GK_Q^4MZtL?NYBKNaDR0jVJf+(S;qulcLJTXqJV@_8 zyBEfXMotSDEV#6vbxF~gD1@t|09 zG5phOKDJeACJ&SM4C5l~=DFhr|3uikm{)EGkrSVgLaJ}u?3uuURH-RLqKNU*ruKJw&?5O{V=8L-^+bKrdPIap{3-4)n$Jet8XGZ5z0%88=0L> zw&fo^62rwVdkGz8Q1zy+p9|OMNbJS2e(m1-ScK~QZQYihkWZt>RqW+c)H_z#iZ&<# zox_~DvyK9Hti)GbJALJpy<3KU1^4vaUaGTK+|?lJhwjsw#=mV6_DT&bAM)=s8PcW&wa2)v?f}?o}6k>)TAog^YhoEm=Y#q{2zRNf+{U* z<$Z=8E2fXxGD%s*7jtLzGap*dZxf@q``3PxxiY(>bnnq`4eakJu|>7rZv}W z+3&(E_$DjvP7kh-czVAo5a!xZvAVRD2$p(zE_>ox6v$4H+Jo=e{Glsma6V&Do23bn z1WW{as;mtL^$$IUFyUGOi8D(N{4Ovst93cB-y9IdYEo>Zh|ZdR;*i=t&MX_5b&lm{ zr)i?q`bits937V9I-pjM9tdXjXHXnO&REh&rj??4TvQ%@*;>}C6^kF?#NBOE7B<@| zWNj(`^U}0%4GvUz*QI%dYto<5J>&!}ph41HezTo?dHR4u-A`v#45-q;eXOh|r!K^l-psSWU5e z{*}UJ)#ymlCE1Yr-z#wbjEOSt*WdF)Smc)y{AyHXjfd=ySEID&iymCT0bidqP;+1f zj?G8BNG@4m`0s|thR+EbXO$u>;Iw0dHQD1C&+YRz(wAxB&?PF@D{oQ;Vv={8GE(-6 zf^i07L^Kj&cOxCcqyM2Jkz|=%elmLh^3|Kavl8!s%+T zzXVcKOH7Ch~nh$ET@gCJA<uX@(@J~~vcUinlYSn2wOcVF!|YzKEE zXe%D&tyNUmomb<%jdimLm{Fmj;qFLISNs8=CUR}BLe=n)iy$QJT%Nhl1l8)hyorc2 z2m^@FM2K3V@rkaX+2>9!AopyJJ?q^6*li(XoR&+p#Km+W+r+^KFVQkQ%_zt4FVwq# zsA=Zkycb8xrA@f@=^1kZjb^Gn)i*1l0W5&Iq)O}Z*Xq=+oMgzy-K;_uHhxOYP90MX z_IAk(H|pJ=*8DU&pmMfvC8oP2GKU?J{RKaC37}I(nCsoyPt2+)^&gXX*o>x!!vx7K%A3d2 ziCTxzM}IoGH*s@1>K$7ScM&V*p=s#agyPVWMX3K1@9%Yim7}e%s-xM%lF+7laM>}wCBB4Cc^{>&pG2BFH?`7Oz%K3mbG=Ob`so- zMBgU$_s)3|z4~^GUW7bjJAYbkYpmZEQFm1jF9)1bjP1STfOG4+8T_5#raVvI4314+J z&tpfAo|QQmLYmhE^91+oM<``H}>g+?$ zgHHFaYee2jI?xsHmG*BY+xvKR&eiNNXYV1jOcMHTaGG!w2h^358H7zCcWDy>xWQUq zA~MHT2y37|OVu7>%m`1N=g;YmjppY*t30W=bNDGLHBdovzP_=xqWxOpdg@HUW;_GU zsVd^9RvsYIAh?(ssKRrls7(F$Nu7jtsbI(>O;V0Qv&RA3N1+2zN3)(kvyW?##ix}o z8?U;Zl8NtpCZ%Gwt>ws3X0oCvr_e3=tmZKTlqwQuyZmy^XaL0CE1U0DadATH*a1Qh zA&FpvLX?lQfJ7hwFy9vI!nq$O3qOSAEjO__0~&(!JQl%xo(+ZxmVlNCOZ!)h{$7j4 NNR_Qz5DO4j_HPr2YefJ6 literal 0 HcmV?d00001