diff --git a/README.md b/README.md index 348d70108..8456aa52f 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,13 @@ Island for Android ## Build Instruction -Island depends on ["deagle" library](https://github.com/oasisfeng/deagle), which must be cloned alongside Island in the same path. +Island depends on ["deagle" library](https://github.com/oasisfeng/deagle) and ["setupwizard" library](https://android.googlesource.com/platform/frameworks/opt/setupwizard), which must be cloned alongside Island in the same path. ``` \-- \- island \- deagle + \- setupwizard ``` This project is constructed into several modules, with **assembly** module as the build portal, diff --git a/assembly/build.gradle b/assembly/build.gradle index 52377e3aa..4f8508263 100644 --- a/assembly/build.gradle +++ b/assembly/build.gradle @@ -10,6 +10,7 @@ android { targetSdkVersion 28 // Private APIs are accessed by module "open" and "fileprovider" (via indirectly loaded remote class) resConfigs "en", "zh" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + missingDimensionStrategy 'compat', 'gingerbreadCompat' // setup-wizard has a "compat" dimension that Insular doesn't } buildFeatures.dataBinding true diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/mobile/build.gradle b/mobile/build.gradle index 2a1665343..b9dc1fb2e 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -7,6 +7,7 @@ android { defaultConfig { minSdkVersion this.minSdkVersion testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + missingDimensionStrategy 'compat', 'gingerbreadCompat' // setup-wizard-lib has this dimension } buildFeatures.dataBinding true @@ -28,7 +29,7 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.aar']) + implementation project(':setup-wizard-lib') implementation project(':shared') implementation project(':deagle') diff --git a/mobile/libs/setup-wizard-lib-platform-release.aar b/mobile/libs/setup-wizard-lib-platform-release.aar deleted file mode 100644 index f847b1fa3..000000000 Binary files a/mobile/libs/setup-wizard-lib-platform-release.aar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 4e66da2ab..13ca9ab6b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ include 'shared', 'engine', 'mobile', 'fileprovider', 'installer', 'watcher', 'open' include 'assembly' include ':deagle'; project(':deagle').projectDir = new File(settingsDir, '../deagle/library') +include ':setup-wizard-lib'; project(':setup-wizard-lib').projectDir = new File('../setupwizard/library'); project(':setup-wizard-lib').buildFileName = 'standalone.gradle'