Commit be55cef0 authored by Ralph Pina's avatar Ralph Pina Committed by Matt Apperson
Browse files

bump android dependencies (#524) 

* bump android dependencies

* fixed lint
parent e76936b4

android-exoplayer/build.gradle

+1 −1
Changes for android-exoplayer/build.gradle: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' 


android {

    compileSdkVersion 23

    buildToolsVersion "23.0.1"

    buildToolsVersion "25.0.2"



    defaultConfig {

        minSdkVersion 16

android/build.gradle

+4 −3
Changes for android/build.gradle: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'



android {

    compileSdkVersion 23

    buildToolsVersion "23.0.1"

    compileSdkVersion 25

    buildToolsVersion "25.0.2"



    defaultConfig {

        minSdkVersion 16

        targetSdkVersion 22

        targetSdkVersion 25

        versionCode 1

        versionName "1.0"

        ndk {
@@ -16,6 +16,7 @@ android { 
}



dependencies {

    //noinspection GradleDynamicVersion

    provided 'com.facebook.react:react-native:+'

    compile 'com.yqritc:android-scalablevideoview:1.0.4'

}

android/src/main/java/com/brentvatne/react/ReactVideoView.java

+6 −4
Changes for android/src/main/java/com/brentvatne/react/ReactVideoView.java: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line 
package com.brentvatne.react;



import android.annotation.SuppressLint;

import android.content.res.AssetFileDescriptor;

import android.graphics.Matrix;

import android.media.MediaPlayer;
@@ -8,8 +9,10 @@ import android.os.Handler; 
import android.util.Log;

import android.view.MotionEvent;

import android.webkit.CookieManager;



import android.widget.MediaController;



import com.android.vending.expansion.zipfile.APKExpansionSupport;

import com.android.vending.expansion.zipfile.ZipResourceFile;

import com.facebook.react.bridge.Arguments;

import com.facebook.react.bridge.LifecycleEventListener;

import com.facebook.react.bridge.WritableMap;
@@ -17,9 +20,6 @@ import com.facebook.react.uimanager.ThemedReactContext; 
import com.facebook.react.uimanager.events.RCTEventEmitter;

import com.yqritc.scalablevideoview.ScalableType;

import com.yqritc.scalablevideoview.ScalableVideoView;



import com.android.vending.expansion.zipfile.APKExpansionSupport;

import com.android.vending.expansion.zipfile.ZipResourceFile;

import com.yqritc.scalablevideoview.ScaleManager;

import com.yqritc.scalablevideoview.Size;
@@ -27,6 +27,7 @@ import java.io.IOException; 
import java.util.HashMap;

import java.util.Map;



@SuppressLint("ViewConstructor")

public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnPreparedListener, MediaPlayer

        .OnErrorListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnInfoListener, LifecycleEventListener, MediaController.MediaPlayerControl {
@@ -145,6 +146,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    }



    @Override

    @SuppressLint("DrawAllocation")

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

example/android/app/build.gradle

+4 −4
Changes for example/android/app/build.gradle: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ def enableSeparateBuildPerCPUArchitecture = false 
def enableProguardInReleaseBuilds = false



android {

    compileSdkVersion 23

    buildToolsVersion "23.0.1"

    compileSdkVersion 25

    buildToolsVersion '25.0.2'



    defaultConfig {

        applicationId "com.videoplayer"

        minSdkVersion 16

        targetSdkVersion 22

        targetSdkVersion 25

        versionCode 1

        versionName "1.0"

        ndk {
@@ -127,7 +127,7 @@ android { 
}



dependencies {

    compile "com.android.support:appcompat-v7:23.0.1"

    compile "com.android.support:appcompat-v7:25.2.0"

    compile "com.facebook.react:react-native:+"  // From node_modules

    compile project(':react-native-video')

//    compile project(':react-native-video-exoplayer') // uncomment to use exoplayer

example/android/build.gradle

+1 −1
Changes for example/android/build.gradle: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ buildscript { 
        jcenter()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:2.2.3'

        classpath 'com.android.tools.build:gradle:2.3.0'



        // NOTE: Do not place your application dependencies here; they belong

        // in the individual module build.gradle files