Skip to content

Commit

Permalink
update to capacitor@4.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jepiqueau committed Jan 22, 2023
1 parent e2dcf60 commit 5fff962
Show file tree
Hide file tree
Showing 29 changed files with 988 additions and 837 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 4.6.1 (2023-01-22)

### Chores

- Update to Capacitor 4.6.1
- Update to hls.js 1.3.1 (Web)
- Update to Exoplayer 2.18.1 (Android)

### Bug Fixes

- PR Exoplayer v2.18.1 and some updates - fixes #114 from PhantomPainX [Notes from PhantomPainX](https://github.com/jepiqueau/capacitor-video-player/blob/master/docs/Notes_Exoplayer2.18.1.md)

## 4.1.0 (2022-09-11)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Capacitor Data Storage Sqlite
Copyright (c) 2020 - 2023 Capacitor Data Storage Sqlite

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
Binary file modified android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file modified android/.gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
4 changes: 2 additions & 2 deletions android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
arguments=--init-script /var/folders/jz/m6091z2x6yn18q_qgnsy42lm0000gn/T/init12484989191574167869.gradle --init-script /var/folders/jz/m6091z2x6yn18q_qgnsy42lm0000gn/T/init5718432896269751373.gradle
auto.sync=false
arguments=--init-script /var/folders/jz/m6091z2x6yn18q_qgnsy42lm0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/jz/m6091z2x6yn18q_qgnsy42lm0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
auto.sync=true
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
Expand Down
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="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/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/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/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="/Volumes/Development_Lacie/Development/new/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/new/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="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/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/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/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="/Volumes/Development_Lacie/Development/new/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/new/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="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/assets"/><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/debug/assets"/></dataSet></merger>
<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/new/capacitor-video-player/android/src/main/assets"/><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/debug/assets"/></dataSet></merger>
Binary file modified android/build/outputs/aar/android-debug.aar
Binary file not shown.
36 changes: 18 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,25 @@
-- Merging decision tree log ---
manifest
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12
package
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:2:5-61
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:2:5-61
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
xmlns:android
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:11-69
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:11-69
uses-sdk
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml
24 changes: 24 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.

# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
21 changes: 21 additions & 0 deletions android/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public void initPlayer(PluginCall call) {
chromecast = _chromecast;
String _artwork = "";
if (call.getData().has("artwork")) {
_artwork = call.getString("artwork");
_artwork = call.getString("artwork");
}
artwork = _artwork;
AddObserversToNotificationCenter();
Expand All @@ -224,7 +224,7 @@ public void initPlayer(PluginCall call) {
requestAllPermissions(call, "videosPermissionsCallback");
}
} else {
isPermissions = true;
isPermissions = true;
}
if (isPermissions) {
// Got Permissions ;
Expand Down
Loading

0 comments on commit 5fff962

Please sign in to comment.