-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into 'master'
Develop See merge request papers/airgap/airgap-wallet!601
- Loading branch information
Showing
7 changed files
with
372 additions
and
919 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // a workaround for cordova-diagnostic-plugin: the plugin ignores Capacitor config setting and installs all its features | ||
|
|
||
| const fs = require('fs') | ||
| const path = require('path') | ||
|
|
||
| const rootdir = '' | ||
| const pluginConfig = path.join(rootdir, 'node_modules/cordova.plugins.diagnostic/plugin.xml') | ||
|
|
||
| const configFiles = [pluginConfig] | ||
|
|
||
| const LEGACY_SUPPORT_V4_ID = 'androidx.legacy:legacy-support-v4' | ||
| const APP_COMPAT_ID = 'androidx.appcompat:appcompat' | ||
|
|
||
| function getXMLDependencyRegex(id) { | ||
| return RegExp(`(?<indent>.*)<framework src="(?<dependencyId>${id}):\\$ANDROIDX_VERSION" />`, 'g') | ||
| } | ||
|
|
||
| function patchDependencyVersion(configFile, versions) { | ||
| fs.readFile(configFile, 'utf8', function(err, data) { | ||
| if (err) { | ||
| return console.log(err) | ||
| } | ||
|
|
||
| const regexes = [ | ||
| getXMLDependencyRegex(LEGACY_SUPPORT_V4_ID), | ||
| getXMLDependencyRegex(APP_COMPAT_ID) | ||
| ] | ||
| let result = data | ||
| regexes.forEach(regex => { | ||
| while ((match = regex.exec(result))) { | ||
| const indent = match.groups.indent || '' | ||
| const dependencyId = match.groups.dependencyId | ||
| const version = versions[dependencyId] | ||
|
|
||
| if (version !== undefined) { | ||
| result = result.replace(regex, `${indent}<framework src="${dependencyId}:${version}" />`) | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| fs.writeFile(configFile, result, 'utf8', function(err) { | ||
| if (err) { | ||
| console.log(err) | ||
| } | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| function getVersions(callback) { | ||
| const variablesGradle = path.join(rootdir, 'android/variables.gradle') | ||
| fs.readFile(variablesGradle, 'utf8', function(err, data) { | ||
| if (err) { | ||
| callback(err, undefined) | ||
| } | ||
|
|
||
| const appCompatVersionMatch = RegExp('.*androidxAppCompatVersion = \'(?<version>.+)\'', 'g').exec | ||
| (data) | ||
| const appCompatVersion = appCompatVersionMatch ? appCompatVersionMatch.groups.version : undefined | ||
|
|
||
| const versions = { | ||
| [LEGACY_SUPPORT_V4_ID]: '1.0.0', | ||
| [APP_COMPAT_ID]: appCompatVersion || '1.3.1' | ||
| } | ||
|
|
||
| callback(undefined, versions) | ||
| }) | ||
| } | ||
|
|
||
| getVersions((err, versions) => { | ||
| if (err) { | ||
| return console.log(err) | ||
| } | ||
|
|
||
| configFiles.forEach(configFile => patchDependencyVersion(configFile, versions)) | ||
| }) |