Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

refactor: switch to open source setupwizard lib #137

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file modified gradlew
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,7 +29,7 @@ android {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.aar'])
implementation project(':setup-wizard-lib')
implementation project(':shared')
implementation project(':deagle')

Expand Down
Binary file removed mobile/libs/setup-wizard-lib-platform-release.aar
Binary file not shown.
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -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'