-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #326 from immutable/fix/gree-webview-conflict-android
[DX-3386] fix: android gree webview package conflict
- Loading branch information
Showing
23 changed files
with
283 additions
and
168 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
# Gree Android plugin | ||
|
||
This is the library for the `WebViewPlugin.aar` that is used for Gree in Unity. | ||
This is the library for the `ImmutableWebViewPlugin.aar` that is used for Gree in Unity. | ||
|
||
To build and use a new version: | ||
1. Run the `assemble` gradle command (A custom task will copy the generated aar to `src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/Android` and rename it to `WebViewPlugin.aar`) | ||
1. Run the `assemble` gradle command (A custom task will copy the generated aar to `src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/Android` and rename it to `ImmutableWebViewPlugin.aar`) | ||
2. Update `src/packages/Passport/Runtime/ThirdParty/Gree/Assets/PluginsWebViewObject.cs` if any references were changed |
Binary file modified
BIN
+6.07 KB
(110%)
Plugins/Android/Gree-Android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions
3
Plugins/Android/Gree-Android/gradle/wrapper/gradle-wrapper.properties
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 |
---|---|---|
@@ -1,6 +1,5 @@ | ||
#Mon Feb 13 14:32:18 JST 2017 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip |
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
Oops, something went wrong.