diff --git a/build.gradle b/build.gradle index 5717830..562fed5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,16 +2,18 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' - classpath 'com.novoda:bintray-release:0.4.0' + classpath 'com.android.tools.build:gradle:3.6.4'//for gradle5.x for novoda:bintray-release + classpath 'com.novoda:bintray-release:0.9.2' } } allprojects { repositories { + google() jcenter() } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..98bed16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,21 @@ # 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. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # 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 \ No newline at end of file +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 229e6b7..1e74208 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 21 01:36:56 JST 2016 +#Thu Feb 11 23:09:25 JST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip diff --git a/playercontrolview/build.gradle b/playercontrolview/build.gradle index 36b4215..4ce151d 100644 --- a/playercontrolview/build.gradle +++ b/playercontrolview/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 25 - buildToolsVersion "25.0.1" + compileSdkVersion 30 + buildToolsVersion "30.0.2" defaultConfig { - minSdkVersion 14 - targetSdkVersion 25 + minSdkVersion 21 + targetSdkVersion 30 versionCode 1 versionName "1.0.1" } @@ -24,9 +24,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.0.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.13.1' + implementation 'androidx.appcompat:appcompat:1.2.0' } publish { diff --git a/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PausePlayButton.java b/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PausePlayButton.java index 5dbfb24..e315d9f 100644 --- a/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PausePlayButton.java +++ b/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PausePlayButton.java @@ -2,10 +2,11 @@ import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.AppCompatImageButton; import android.util.AttributeSet; +import androidx.appcompat.widget.AppCompatImageButton; +import androidx.core.content.ContextCompat; + public class PausePlayButton extends AppCompatImageButton { private Drawable playDrawable; diff --git a/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PlayerControlView.java b/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PlayerControlView.java index ea3fc50..1113de8 100644 --- a/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PlayerControlView.java +++ b/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/PlayerControlView.java @@ -4,8 +4,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.Gravity; import android.view.KeyEvent; @@ -19,6 +17,9 @@ import android.widget.SeekBar; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; + public class PlayerControlView extends FrameLayout { public static final int DEFAULT_FAST_REWIND_MS = 5_000; diff --git a/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/Util.java b/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/Util.java index e96c605..444b506 100644 --- a/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/Util.java +++ b/playercontrolview/src/main/java/com/github/ogapants/playercontrolview/Util.java @@ -4,7 +4,8 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; -import android.support.annotation.ColorInt; + +import androidx.annotation.ColorInt; class Util { diff --git a/sample/build.gradle b/sample/build.gradle index 533b45a..ac119d6 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.1" + compileSdkVersion 30 + buildToolsVersion "30.0.2" defaultConfig { applicationId "com.github.ogapants.playercontrolview.sample" - minSdkVersion 14 - targetSdkVersion 25 + minSdkVersion 21 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -20,9 +20,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile project(':playercontrolview') - compile 'com.android.support:appcompat-v7:25.0.1' - compile 'com.google.android.exoplayer:exoplayer:r1.5.16' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.13.1' + implementation project(':playercontrolview') + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.exoplayer:exoplayer:r1.5.16' } diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/CustomizedActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/CustomizedActivity.java index b5d9c7f..a0b6b13 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/CustomizedActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/CustomizedActivity.java @@ -2,12 +2,13 @@ import android.media.MediaPlayer; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Toast; import android.widget.VideoView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; + import com.github.ogapants.playercontrolview.PlayerControlView; public class CustomizedActivity extends AppCompatActivity { diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/ExoPlayerActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/ExoPlayerActivity.java index 73764a5..461b920 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/ExoPlayerActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/ExoPlayerActivity.java @@ -3,12 +3,13 @@ import android.annotation.TargetApi; import android.os.Build; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.MotionEvent; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.github.ogapants.playercontrolview.PlayerControlView; import com.google.android.exoplayer.AspectRatioFrameLayout; import com.google.android.exoplayer.util.PlayerControl; diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MainActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MainActivity.java index f4b60e8..101ca00 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MainActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MainActivity.java @@ -3,13 +3,14 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.MediaController; +import androidx.appcompat.app.AppCompatActivity; + import com.github.ogapants.playercontrolview.PlayerControlView; import com.github.ogapants.playercontrolview.sample.legacy.McExoPlayerActivity; import com.github.ogapants.playercontrolview.sample.legacy.McMusicActivity; diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MusicActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MusicActivity.java index 7a247f5..e2e123e 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MusicActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/MusicActivity.java @@ -3,9 +3,10 @@ import android.media.MediaPlayer; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; + import com.github.ogapants.playercontrolview.MediaPlayerControlImpl; import com.github.ogapants.playercontrolview.PlayerControlView; diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/VideoViewActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/VideoViewActivity.java index c9791b1..aab14be 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/VideoViewActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/VideoViewActivity.java @@ -2,9 +2,10 @@ import android.media.MediaPlayer; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.widget.VideoView; +import androidx.appcompat.app.AppCompatActivity; + import com.github.ogapants.playercontrolview.PlayerControlView; public class VideoViewActivity extends AppCompatActivity { diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McExoPlayerActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McExoPlayerActivity.java index 0838e13..74837d4 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McExoPlayerActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McExoPlayerActivity.java @@ -3,7 +3,6 @@ import android.annotation.TargetApi; import android.os.Build; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.MotionEvent; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -11,6 +10,8 @@ import android.widget.MediaController; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.github.ogapants.playercontrolview.sample.R; import com.github.ogapants.playercontrolview.sample.SampleExoPlayer; import com.google.android.exoplayer.AspectRatioFrameLayout; diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McMusicActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McMusicActivity.java index 0eda4cc..7368ab6 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McMusicActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McMusicActivity.java @@ -4,10 +4,11 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.MediaController; +import androidx.appcompat.app.AppCompatActivity; + import com.github.ogapants.playercontrolview.sample.R; diff --git a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McVideoViewActivity.java b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McVideoViewActivity.java index 19a4423..69ec1ae 100644 --- a/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McVideoViewActivity.java +++ b/sample/src/main/java/com/github/ogapants/playercontrolview/sample/legacy/McVideoViewActivity.java @@ -2,10 +2,11 @@ import android.media.MediaPlayer; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.widget.MediaController; import android.widget.VideoView; +import androidx.appcompat.app.AppCompatActivity; + import com.github.ogapants.playercontrolview.sample.R; public class McVideoViewActivity extends AppCompatActivity {