-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Harmon Wood
committed
Jul 14, 2024
1 parent
9a832a5
commit c3e9975
Showing
8 changed files
with
29 additions
and
37 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
eclipse.preferences.version=1 | ||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=16 | ||
org.eclipse.jdt.core.compiler.compliance=16 | ||
org.eclipse.jdt.core.compiler.source=16 | ||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 | ||
org.eclipse.jdt.core.compiler.compliance=21 | ||
org.eclipse.jdt.core.compiler.source=21 |
2 changes: 1 addition & 1 deletion
2
android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
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,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/debug/jniLibs"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/debug/jniLibs"/></dataSet></merger> |
2 changes: 1 addition & 1 deletion
2
android/build/intermediates/incremental/mergeDebugShaders/merger.xml
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,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/debug/shaders"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/debug/shaders"/></dataSet></merger> |
2 changes: 1 addition & 1 deletion
2
android/build/intermediates/incremental/packageDebugAssets/merger.xml
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,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/next/capacitor-video-player/android/build/intermediates/shader_assets/debug/out"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/build/intermediates/shader_assets/debug/out"/></dataSet></merger> |
Binary file not shown.
27 changes: 9 additions & 18 deletions
27
android/build/outputs/logs/manifest-merger-debug-report.txt
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,25 +1,16 @@ | ||
-- Merging decision tree log --- | ||
manifest | ||
ADDED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
ADDED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
package | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
xmlns:android | ||
ADDED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml:1:11-69 | ||
ADDED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml:1:11-69 | ||
uses-sdk | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml reason: use-sdk injection requested | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml reason: use-sdk injection requested | ||
INJECTED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
android:targetSdkVersion | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
android:minSdkVersion | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/next/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/harmon/workspace/capacitor-video-player/android/src/main/AndroidManifest.xml |
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