Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(cli): signing type option issue #6716

Merged
merged 15 commits into from
Aug 3, 2023
Merged

fix(cli): signing type option issue #6716

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7e27441
load all options not only for apksigner
Jul 6, 2023
51d1e67
modify the option name use lower case instead of -
Jul 6, 2023
67dffba
npm run fmt
liuwin7 Jul 10, 2023
3f76594
ignore no-unused-vars lint rule
liuwin7 Jul 10, 2023
452a8a6
Merge branch 'main' into main
markemer Jul 11, 2023
6d02ece
keep the option name and use the corrent variable name.
liuwin7 Jul 12, 2023
6e02f9a
Merge branch 'main' of github.com:liuwin7/capacitor
liuwin7 Jul 12, 2023
5d1a9e6
Merge branch 'main' into main
liuwin7 Jul 13, 2023
4b86ec3
Merge branch 'main' into main
markemer Jul 13, 2023
b7de39d
Merge branch 'main' into main
markemer Jul 14, 2023
b516176
Merge branch 'main' into main
liuwin7 Jul 18, 2023
4d1cec5
Merge branch 'main' into main
liuwin7 Jul 20, 2023
a54d7de
Merge branch 'main' into main
liuwin7 Jul 26, 2023
dbcb122
Merge branch 'main' into main
liuwin7 Jul 31, 2023
1953ec1
Merge branch 'main' into main
liuwin7 Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cli/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,10 @@ async function loadAndroidConfig(
const buildOptions = {
keystorePath: extConfig.android?.buildOptions?.keystorePath,
keystorePassword: extConfig.android?.buildOptions?.keystorePassword,
keystoreAlias: extConfig.android?.buildOptions?.keystoreAlias,
keystoreAliasPassword:
extConfig.android?.buildOptions?.keystoreAliasPassword,
signingType: extConfig.android?.buildOptions?.signingType,
releaseType: extConfig.android?.buildOptions?.releaseType,
};

Expand Down
2 changes: 1 addition & 1 deletion cli/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export function runProgram(config: Config): void {
)
.addOption(
new Option(
'--signing-type <signingtype>',
'--signingtype <signingtype>',
markemer marked this conversation as resolved.
Show resolved Hide resolved
'Program used to sign apps (default: jarsigner)',
).choices(['apksigner', 'jarsigner']),
)
Expand Down
1 change: 1 addition & 0 deletions core/native-bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@ const initBridge = (w: any): void => {
});
};

// eslint-disable-next-line @typescript-eslint/no-unused-vars
markemer marked this conversation as resolved.
Show resolved Hide resolved
cap.withPlugin = (_pluginId, _fn) => dummy;

cap.Exception = CapacitorException;
Expand Down
20 changes: 0 additions & 20 deletions ios/Capacitor/Capacitor/JS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ internal struct JSCall {
let pluginId: String
let method: String
let callbackId: String

init(options: [String: Any], pluginId: String, method: String, callbackId: String) {
liuwin7 marked this conversation as resolved.
Show resolved Hide resolved
self.options = options
self.pluginId = pluginId
self.method = method
self.callbackId = callbackId
}
}

internal protocol JSResultProtocol {
Expand Down Expand Up @@ -64,11 +57,6 @@ internal struct JSResult: JSResultProtocol {
let call: JSCall
let result: PluginCallResult?

init(call: JSCall, result: PluginCallResult?) {
self.call = call
self.result = result
}

func jsonPayload() -> String {
guard let result = result else {
return SerializationResult.undefined.rawValue
Expand Down Expand Up @@ -101,14 +89,6 @@ internal struct JSResultError: JSResultProtocol {
let errorCode: String?
let result: PluginCallResult

init(call: JSCall, errorMessage: String, errorDescription: String, errorCode: String?, result: PluginCallResult) {
self.call = call
self.errorMessage = errorMessage
self.errorDescription = errorDescription
self.errorCode = errorCode
self.result = result
}

func jsonPayload() -> String {
var errorDictionary: [String: Any] = [
"message": self.errorMessage,
Expand Down
2 changes: 1 addition & 1 deletion ios/Capacitor/Capacitor/WebViewAssetHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
]

// if using live reload, then set CORS headers
if self.serverUrl != nil && self.serverUrl?.scheme != localUrl.scheme {
if self.serverUrl != nil && self.serverUrl?.scheme != localUrl.scheme {
headers["Access-Control-Allow-Origin"] = self.serverUrl?.absoluteString
headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
}
Expand Down