Skip to content

Commit

Permalink
iupdated contribution docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Harmon Wood committed Jul 14, 2024
1 parent 9a832a5 commit c3e9975
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 37 deletions.
8 changes: 4 additions & 4 deletions android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
arguments=--init-script /var/folders/jz/m6091z2x6yn18q_qgnsy42lm0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/jz/m6091z2x6yn18q_qgnsy42lm0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
auto.sync=true
arguments=--init-script /var/folders/02/xh5bpd4d0f30l96b526d7jp80000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/02/xh5bpd4d0f30l96b526d7jp80000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
connection.project.dir=../../angular-videoplayer-app/android
eclipse.preferences.version=1
gradle.user.home=
java.home=/Users/queaujeanpierre/Library/Java/JavaVirtualMachines/corretto-16.0.2/Contents/Home
java.home=/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home
jvm.arguments=
offline.mode=false
override.workspace.settings=true
Expand Down
6 changes: 3 additions & 3 deletions android/.settings/org.eclipse.jdt.core.prefs
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
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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/debug/jniLibs"/></dataSet></merger>
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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/harmon/workspace/capacitor-video-player/android/src/debug/shaders"/></dataSet></merger>
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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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 removed android/build/outputs/aar/android-debug.aar
Binary file not shown.
27 changes: 9 additions & 18 deletions android/build/outputs/logs/manifest-merger-debug-report.txt
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
19 changes: 10 additions & 9 deletions docs/contributing/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,27 @@ This project uses the [Material for MkDocs](https://squidfunk.github.io/mkdocs-m
To assist in using mkdocs on any environment, mkdocs software can be installed through [Micromamba](https://mamba.readthedocs.io/en/latest/installation/micromamba-installation.html) python environment. To install mkdocs, run the following command:

Start the python environment by running the following command:
=== "Windows"
```powershell
micromamba activate cap-video
```

=== "macOS/Linux"
```shell
micromamba activate cap-video
```

=== "Windows"
```powershell
micromamba activate cap-video
```

## Serving the documentation locally

To serve the documentation locally, run the following command:

=== "Windows"
```powershell
=== "macOS/Linux"
```shell
mkdocs serve
```

=== "macOS/Linux"
```shell
=== "Windows"
```powershell
mkdocs serve
```
```

0 comments on commit c3e9975

Please sign in to comment.