Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
rubensousa committed Dec 12, 2017
1 parent c06f4ca commit e69dde6
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 38 deletions.
18 changes: 7 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
}
}

allprojects {
repositories {
jcenter()
maven {
url "https://maven.google.com"
}
maven {
url "https://dl.bintray.com/rubensousa/maven"
}
google()
}
}

ext {
compileSdkVersion = 26
buildToolsVersion = '26.0.1'
compileSdkVersion = 27
buildToolsVersion = '27.0.2'
minSdkVersion = 16
targetSdkVersion = compileSdkVersion
supportLibVersion = '26.0.0'
supportLibVersion = '27.0.2'
}

task clean(type: Delete) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Mar 15 10:50:47 GMT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
16 changes: 7 additions & 9 deletions previewseekbar-exoplayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,18 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:appcompat-v7:$supportLibVersion"
compile 'com.google.android.exoplayer:exoplayer-ui:r2.5.1'
compile project(':previewseekbar')
testCompile 'junit:junit:4.12'
api "com.android.support:appcompat-v7:$supportLibVersion"
api 'com.google.android.exoplayer:exoplayer-ui:r2.5.1'
api project(':previewseekbar')
}

ext {
VERSION_NAME="2.5.1"
POM_ARTIFACT_ID="previewseekbar-exoplayer"
POM_DESCRIPTION="ExoPlayer components for PreviewSeekBar"
VERSION_NAME = "2.5.1"
POM_ARTIFACT_ID = "previewseekbar-exoplayer"
POM_DESCRIPTION = "ExoPlayer components for PreviewSeekBar"
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
Expand Down
7 changes: 2 additions & 5 deletions previewseekbar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,10 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:appcompat-v7:$supportLibVersion"
compile "com.android.support:cardview-v7:$supportLibVersion"
testCompile 'junit:junit:4.12'
api "com.android.support:appcompat-v7:$supportLibVersion"
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
Expand Down
10 changes: 4 additions & 6 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:appcompat-v7:$supportLibVersion"
compile "com.android.support:design:$supportLibVersion"
compile 'com.google.android.exoplayer:exoplayer:r2.5.1'
compile project(':previewseekbar-exoplayer')
testCompile 'junit:junit:4.12'
implementation "com.android.support:appcompat-v7:$supportLibVersion"
implementation "com.android.support:design:$supportLibVersion"
implementation 'com.google.android.exoplayer:exoplayer:r2.5.1'
implementation project(':previewseekbar-exoplayer')
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.github.rubensousa.previewseekbar.sample.exoplayer;

import android.net.Uri;
import android.util.Log;
import android.view.SurfaceView;
import android.view.View;

Expand Down Expand Up @@ -185,7 +186,7 @@ public void onRepeatModeChanged(int repeatMode) {

@Override
public void onPlayerError(ExoPlaybackException error) {

Log.e("PlaybackError", error.toString());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<string name="app_name">PreviewSeekBar</string>
<string name="url_dash">https://storage.googleapis.com/wvmedia/clear/h264/tears/tears_sd.mpd</string>
<string name="url_smooth">http://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism</string>
<string name="url_hls">https://bitdash-a.akamaihd.net/content/MI201109210084_1/m3u8s/f08e80da-bf1d-4e3d-8899-f0f6155f6efa.m3u8</string>
<string name="url_hls">https://mnmedias.api.telequebec.tv/m3u8/29880.m3u8</string>
</resources>

0 comments on commit e69dde6

Please sign in to comment.