diff --git a/.travis.yml b/.travis.yml index 1bba4c0..59a7e03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,13 +28,13 @@ install: - mkdir -p cd ~/.buildozer/android/platform/ - wget -q 'https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip' -P ~/.buildozer/android/platform/ - wget -q 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ -- wget -q 'https://dl.google.com/android/repository/platform-26_r02.zip' -P ~/.buildozer/android/platform/ +- wget -q 'https://dl.google.com/android/repository/platform-27_r01.zip' -P ~/.buildozer/android/platform/ - wget -q 'https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip' -P ~/.buildozer/android/platform/ - unzip -qq ~/.buildozer/android/platform/android-ndk-r13b-linux-x86_64.zip -d ~/.buildozer/android/platform/ - tar -xf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ - mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk-23 -- unzip -qq ~/.buildozer/android/platform/platform-26_r02.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms -- mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-8.0.0 ~/.buildozer/android/platform/android-sdk-23/platforms/android-26 +- unzip -qq ~/.buildozer/android/platform/platform-27_r01.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms +- mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-8.1.0 ~/.buildozer/android/platform/android-sdk-23/platforms/android-27 - mkdir -p ~/.buildozer/android/platform/android-sdk-23/build-tools - unzip -qq ~/.buildozer/android/platform/build-tools_r26.0.1-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools - mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-8.0.0 ~/.buildozer/android/platform/android-sdk-23/build-tools/26.0.1 diff --git a/Vagrantfile b/Vagrantfile index 0986a04..e3d5fc5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -65,7 +65,7 @@ Vagrant.configure("2") do |config| mkdir -p cd $HOME/.buildozer/android/platform/ wget -q 'https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip' -P $HOME/.buildozer/android/platform/ wget -q 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P $HOME/.buildozer/android/platform/ - wget -q 'https://dl.google.com/android/repository/platform-26_r02.zip' -P $HOME/.buildozer/android/platform/ + wget -q 'https://dl.google.com/android/repository/platform-27_r01.zip' -P $HOME/.buildozer/android/platform/ wget -q 'https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip' -P $HOME/.buildozer/android/platform/ unzip -qq $HOME/.buildozer/android/platform/android-ndk-r13b-linux-x86_64.zip -d $HOME/.buildozer/android/platform/ rm $HOME/.buildozer/android/platform/android-ndk-r13b-linux-x86_64.zip @@ -73,8 +73,8 @@ Vagrant.configure("2") do |config| rm $HOME/.buildozer/android/platform/android-sdk_r23-linux.tgz mv $HOME/.buildozer/android/platform/android-sdk-linux $HOME/.buildozer/android/platform/android-sdk-23 unzip -qq $HOME/.buildozer/android/platform/android-23_r02.zip -d $HOME/.buildozer/android/platform/android-sdk-23/platforms - rm $HOME/.buildozer/android/platform/platform-26_r02.zip - mv $HOME/.buildozer/android/platform/android-sdk-23/platforms/android-8.0.0 $HOME/.buildozer/android/platform/android-sdk-23/platforms/android-26 + rm $HOME/.buildozer/android/platform/platform-27_r01.zip + mv $HOME/.buildozer/android/platform/android-sdk-23/platforms/android-8.1.0 $HOME/.buildozer/android/platform/android-sdk-23/platforms/android-27 mkdir -p $HOME/.buildozer/android/platform/android-sdk-23/build-tools unzip -qq $HOME/.buildozer/android/platform/build-tools_r26.0.1-linux.zip -d $HOME/.buildozer/android/platform/android-sdk-23/build-tools rm $HOME/.buildozer/android/platform/build-tools_r26.0.1-linux.zip diff --git a/app/package-lock.json b/app/package-lock.json index f80b0bf..038cb75 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -5236,9 +5236,8 @@ } }, "react-native-video": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-2.0.0.tgz", - "integrity": "sha1-8z+m+35+PJOrV4eUTO/Vi/c1WGc=", + "version": "github:lbryio/react-native-video#47965a66289dd4ff3c5cfdccbb9418a7e4e5b7be", + "from": "github:lbryio/react-native-video#exoplayer-lbry-android", "requires": { "keymirror": "0.1.1", "prop-types": "^15.5.10" diff --git a/app/package.json b/app/package.json index 2796b79..ed29a78 100644 --- a/app/package.json +++ b/app/package.json @@ -12,7 +12,7 @@ "react-native": "0.55.3", "react-native-image-zoom-viewer": "^2.2.5", "react-native-vector-icons": "^5.0.0", - "react-native-video": "2.0.0", + "react-native-video": "lbryio/react-native-video#exoplayer-lbry-android", "react-navigation": "^1.5.12", "react-navigation-redux-helpers": "^1.0.1", "react-redux": "^5.0.3", diff --git a/buildozer.spec.sample b/buildozer.spec.sample index 9160385..10e880f 100644 --- a/buildozer.spec.sample +++ b/buildozer.spec.sample @@ -89,7 +89,7 @@ fullscreen = 0 android.permissions = ACCESS_NETWORK_STATE,BLUETOOTH,INTERNET,READ_EXTERNAL_STORAGE,READ_PHONE_STATE,WRITE_EXTERNAL_STORAGE # (int) Android API to use -android.api = 26 +android.api = 27 # (int) Minimum API required android.minapi = 21 @@ -148,7 +148,7 @@ android.react_src = ./app # (list) Gradle dependencies to add (currently works only with sdl2_gradle # bootstrap) -android.gradle_dependencies = com.android.support:appcompat-v7:26.0.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+ +android.gradle_dependencies = com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+ # (str) python-for-android branch to use, defaults to master #p4a.branch = stable diff --git a/buildozer.spec.travis b/buildozer.spec.travis index 9160385..10e880f 100644 --- a/buildozer.spec.travis +++ b/buildozer.spec.travis @@ -89,7 +89,7 @@ fullscreen = 0 android.permissions = ACCESS_NETWORK_STATE,BLUETOOTH,INTERNET,READ_EXTERNAL_STORAGE,READ_PHONE_STATE,WRITE_EXTERNAL_STORAGE # (int) Android API to use -android.api = 26 +android.api = 27 # (int) Minimum API required android.minapi = 21 @@ -148,7 +148,7 @@ android.react_src = ./app # (list) Gradle dependencies to add (currently works only with sdl2_gradle # bootstrap) -android.gradle_dependencies = com.android.support:appcompat-v7:26.0.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+ +android.gradle_dependencies = com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+ # (str) python-for-android branch to use, defaults to master #p4a.branch = stable diff --git a/buildozer.spec.vagrant b/buildozer.spec.vagrant index 7d78a45..daaf78b 100644 --- a/buildozer.spec.vagrant +++ b/buildozer.spec.vagrant @@ -89,7 +89,7 @@ fullscreen = 0 android.permissions = ACCESS_NETWORK_STATE,BLUETOOTH,INTERNET,READ_EXTERNAL_STORAGE,READ_PHONE_STATE,WRITE_EXTERNAL_STORAGE # (int) Android API to use -android.api = 26 +android.api = 27 # (int) Minimum API required android.minapi = 21 @@ -148,7 +148,7 @@ android.react_src = ./app # (list) Gradle dependencies to add (currently works only with sdl2_gradle # bootstrap) -android.gradle_dependencies = com.android.support:appcompat-v7:23.4.0, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+ +android.gradle_dependencies = com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+ # (str) python-for-android branch to use, defaults to master #p4a.branch = stable diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle index a373fc7..67bba55 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle @@ -29,7 +29,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion {{ android_api }} buildToolsVersion '{{ build_tools_version }}' - defaultConfig { + defaultConfig { minSdkVersion {{ args.min_sdk_version }} targetSdkVersion {{ android_api }} versionCode {{ args.numeric_version }} @@ -66,7 +66,6 @@ android { jniLibs.srcDir 'libs' } } - } dependencies { diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.tmpl.gradle index c331d34..c566f67 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.tmpl.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.tmpl.gradle @@ -1,3 +1,3 @@ rootProject.name = 'browser' include ':react-native-video' -project(':react-native-video').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-video/android') +project(':react-native-video').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-video/android-exoplayer')