移除 cli

This commit is contained in:
v7lin
2022-07-18 14:09:25 +08:00
parent 6bd20e0be0
commit 58b9a55911
4 changed files with 23 additions and 25 deletions

View File

@ -22,6 +22,7 @@ flutter版walle多渠道打包工具
* [Meituan-Dianping/walle](https://github.com/Meituan-Dianping/walle)
* [rxreader/qihoo360-jiagu-docker](https://github.com/rxreader/qihoo360-jiagu-docker)
* [rxreader/tencentcloud-legu](https://github.com/rxreader/tencentcloud-legu)
* [-jar包使用说明](https://cloud.tencent.com/developer/article/1193406)
## Android

View File

@ -285,11 +285,11 @@ class WallePlugin implements Plugin<Project> {
File originalApkFile
if (mergeWalle.qihoo360?.channels?.contains(channel.channelId) ?: false) {
originalApkFile = qihoo360JiaguApk(target, variant, mergeWalle, apkFile, outputDir)
originalApkFile = qihoo360JiaguApk(target, variant, mergeWalle, targetApkFile, outputDir)
} else if (mergeWalle.tencent?.channels?.contains(channel.channelId) ?: false) {
originalApkFile = tencentLeguApk(target, variant, mergeWalle, apkFile, outputDir)
originalApkFile = tencentLeguApk(target, variant, mergeWalle, targetApkFile, outputDir)
} else {
originalApkFile = apkFile
originalApkFile = targetApkFile
}
walleApk(target, mergeWalle, channel, originalApkFile, channelApkFile)
}

View File

@ -257,9 +257,9 @@ class WallePlugin implements Plugin<Project> {
File originalApkFile
if (walle.tencent?.channels?.contains(channel.channelId) ?: false) {
originalApkFile = tencentLeguApk(target, variant, walle.tencent, apkFile, outputDir)
originalApkFile = tencentLeguApk(target, variant, walle.tencent, targetApkFile, outputDir)
} else {
originalApkFile = apkFile
originalApkFile = targetApkFile
}
writePayload(target, channel, originalApkFile, channelApkFile)
}
@ -366,25 +366,22 @@ class WallePlugin implements Plugin<Project> {
}
void signApk(Project target, def variant, File apkFile, File signedApkFile) {
if (org.gradle.internal.os.OperatingSystem.current().isMacOsX() || org.gradle.internal.os.OperatingSystem.current().isLinux()) {
target.exec {
commandLine 'bash', '-lc', "${target.android.sdkDirectory.path}/build-tools/${target.android.buildToolsVersion}/apksigner sign " +
"-ks ${variant.signingConfig.storeFile.path} " +
"-ks-pass pass:${variant.signingConfig.storePassword} " +
"-ks-key-alias ${variant.signingConfig.keyAlias} " +
"--key-pass pass:${variant.signingConfig.keyPassword} " +
"--out ${signedApkFile.path} ${apkFile.path}"
}
} else if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
exec {
commandLine 'cmd', '/c', "${target.android.sdkDirectory.path}\\build-tools\\${target.android.buildToolsVersion}\\apksigner sign " +
"-ks ${variant.signingConfig.storeFile.path} " +
"-ks-pass pass:${variant.signingConfig.storePassword} " +
"-ks-key-alias ${variant.signingConfig.keyAlias} " +
"--key-pass pass:${variant.signingConfig.keyPassword} " +
"--out ${signedApkFile.path} ${apkFile.path}"
}
}
String storeType = variant.signingConfig.storeType
File storeFile = variant.signingConfig.storeFile
String storePassword = variant.signingConfig.storePassword
String keyAlias = variant.signingConfig.keyAlias
String keyPassword = variant.signingConfig.keyPassword
java.security.KeyStore store = java.security.KeyStore.getInstance(storeType != null ? storeType : java.security.KeyStore.getDefaultType())
store.load(new FileInputStream(storeFile), storePassword.toCharArray())
def signerConfig = new com.android.apksig.ApkSigner.SignerConfig.Builder(keyAlias, store.getKey(keyAlias, keyPassword.toCharArray()), Arrays.asList(store.getCertificateChain(keyAlias)))
.build()
def apkSigner = new com.android.apksig.ApkSigner.Builder(Arrays.asList(signerConfig))
.setInputApk(apkFile)
.setOutputApk(signedApkFile)
.build()
apkSigner.sign()
}
void writePayload(Project target, def channel, File apkFile, File channelApkFile) {

View File

@ -183,7 +183,7 @@ packages:
path: ".."
relative: true
source: path
version: "3.0.1"
version: "3.0.4"
sdks:
dart: ">=2.17.1 <3.0.0"
flutter: ">=2.5.0"