diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index 7f51be08a..5c6e2723e 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' @@ -17,14 +18,15 @@ buildscript { allprojects { repositories { jcenter() + google() } } ext { - compileSdkVersion = 23 + compileSdkVersion = 28 buildToolsVersion = "23.0.3" - targetSdkVersion = 23 + targetSdkVersion = 30 versionCode = 800400 versionName = "0.8.4" diff --git a/android/ijkplayer/gradle/wrapper/gradle-wrapper.properties b/android/ijkplayer/gradle/wrapper/gradle-wrapper.properties index f47ae6661..a5473243a 100644 --- a/android/ijkplayer/gradle/wrapper/gradle-wrapper.properties +++ b/android/ijkplayer/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ 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-6.6.1-all.zip + diff --git a/android/ijkplayer/ijkplayer-armv5/build.gradle b/android/ijkplayer/ijkplayer-armv5/build.gradle index b3b7b3a8b..6c0915c93 100644 --- a/android/ijkplayer/ijkplayer-armv5/build.gradle +++ b/android/ijkplayer/ijkplayer-armv5/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion rootProject.ext.targetSdkVersion } buildTypes { diff --git a/android/ijkplayer/ijkplayer-armv5/src/main/AndroidManifest.xml b/android/ijkplayer/ijkplayer-armv5/src/main/AndroidManifest.xml index 5d35eadf2..85f84c960 100644 --- a/android/ijkplayer/ijkplayer-armv5/src/main/AndroidManifest.xml +++ b/android/ijkplayer/ijkplayer-armv5/src/main/AndroidManifest.xml @@ -2,6 +2,6 @@ package="tv.danmaku.ijk.media.player_armv5" > + android:minSdkVersion="14" /> \ No newline at end of file diff --git a/android/ijkplayer/ijkplayer-armv7a/build.gradle b/android/ijkplayer/ijkplayer-armv7a/build.gradle index b3b7b3a8b..6c0915c93 100644 --- a/android/ijkplayer/ijkplayer-armv7a/build.gradle +++ b/android/ijkplayer/ijkplayer-armv7a/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion rootProject.ext.targetSdkVersion } buildTypes { diff --git a/android/ijkplayer/ijkplayer-armv7a/src/main/AndroidManifest.xml b/android/ijkplayer/ijkplayer-armv7a/src/main/AndroidManifest.xml index f3727da39..847fc7755 100644 --- a/android/ijkplayer/ijkplayer-armv7a/src/main/AndroidManifest.xml +++ b/android/ijkplayer/ijkplayer-armv7a/src/main/AndroidManifest.xml @@ -2,6 +2,6 @@ package="tv.danmaku.ijk.media.player_armv7a" > + android:minSdkVersion="14" /> \ No newline at end of file diff --git a/android/ijkplayer/ijkplayer-example/build.gradle b/android/ijkplayer/ijkplayer-example/build.gradle index 3ad8c6acf..5cce4203f 100644 --- a/android/ijkplayer/ijkplayer-example/build.gradle +++ b/android/ijkplayer/ijkplayer-example/build.gradle @@ -12,10 +12,11 @@ android { } defaultConfig { applicationId "tv.danmaku.ijk.media.example" - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion rootProject.ext.targetSdkVersion versionCode rootProject.ext.versionCode versionName rootProject.ext.versionName + flavorDimensions "versionCode" } buildTypes { release { @@ -24,35 +25,36 @@ android { } } productFlavors { - all32 { minSdkVersion 9 } - all64 { minSdkVersion 21 } + all32 { minSdkVersion 21 } + all64 { minSdkVersion 27 } // armv5 {} // armv7a {} // arm64 { minSdkVersion 21 } // x86 {} } + } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.0.1' - compile 'com.android.support:preference-v7:23.0.1' - compile 'com.android.support:support-annotations:23.0.1' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' + implementation 'com.android.support:support-annotations:28.0.0' - compile 'com.squareup:otto:1.3.8' + implementation 'com.squareup:otto:1.3.8' - compile project(':ijkplayer-java') - compile project(':ijkplayer-exo') + implementation project(':ijkplayer-java') + implementation project(':ijkplayer-exo') - all32Compile project(':ijkplayer-armv5') - all32Compile project(':ijkplayer-armv7a') - all32Compile project(':ijkplayer-x86') +// all32Compile project(':ijkplayer-armv5') +// all32Compile project(':ijkplayer-armv7a') +// all32Compile project(':ijkplayer-x86') - all64Compile project(':ijkplayer-armv5') - all64Compile project(':ijkplayer-armv7a') - all64Compile project(':ijkplayer-arm64') - all64Compile project(':ijkplayer-x86') - all64Compile project(':ijkplayer-x86_64') +// all64Implementation project(':ijkplayer-armv5') + all64Implementation project(':ijkplayer-armv7a') + all64Implementation project(':ijkplayer-arm64') +// all64Compile project(':ijkplayer-x86') +// all64Compile project(':ijkplayer-x86_64') // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.4' // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.4' diff --git a/android/ijkplayer/ijkplayer-example/src/main/AndroidManifest.xml b/android/ijkplayer/ijkplayer-example/src/main/AndroidManifest.xml index dd3a3af12..6115be50a 100644 --- a/android/ijkplayer/ijkplayer-example/src/main/AndroidManifest.xml +++ b/android/ijkplayer/ijkplayer-example/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ package="tv.danmaku.ijk.media.example"> + android:minSdkVersion="14" + android:targetSdkVersion="30" /> diff --git a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/activities/FileExplorerActivity.java b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/activities/FileExplorerActivity.java index 7ff800c20..0b5406331 100644 --- a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/activities/FileExplorerActivity.java +++ b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/activities/FileExplorerActivity.java @@ -22,6 +22,7 @@ import android.support.v4.app.FragmentTransaction; import android.text.TextUtils; + import com.squareup.otto.Subscribe; import java.io.File; diff --git a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/application/AppActivity.java b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/application/AppActivity.java index 713b4aafc..b84c22d88 100644 --- a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/application/AppActivity.java +++ b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/application/AppActivity.java @@ -20,7 +20,9 @@ import android.Manifest; import android.annotation.SuppressLint; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; +import android.support.annotation.RequiresApi; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; @@ -37,6 +39,7 @@ public class AppActivity extends AppCompatActivity { private static final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 1; + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/fragments/SampleMediaListFragment.java b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/fragments/SampleMediaListFragment.java index 3361d5012..619d5df93 100644 --- a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/fragments/SampleMediaListFragment.java +++ b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/fragments/SampleMediaListFragment.java @@ -68,7 +68,7 @@ public void onItemClick(AdapterView parent, View view, final int position, fi } }); - mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8", "bipbop basic master playlist"); + mAdapter.addItem("http://live-record.pddpic.com/pdd-live-record/timeshift/17283_production_sprite_20210119_87451018_01_20210119173552_20210119180552.m3u8", "bipbop basic master playlist"); mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear1/prog_index.m3u8", "bipbop basic 400x300 @ 232 kbps"); mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear2/prog_index.m3u8", "bipbop basic 640x480 @ 650 kbps"); mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear3/prog_index.m3u8", "bipbop basic 640x480 @ 1 Mbps"); diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle index e42439355..79cbbef16 100644 --- a/android/ijkplayer/ijkplayer-exo/build.gradle +++ b/android/ijkplayer/ijkplayer-exo/build.gradle @@ -11,7 +11,7 @@ android { abortOnError false } defaultConfig { - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion rootProject.ext.targetSdkVersion } buildTypes { diff --git a/android/ijkplayer/ijkplayer-java/build.gradle b/android/ijkplayer/ijkplayer-java/build.gradle index 30d3ad27b..c395ed395 100644 --- a/android/ijkplayer/ijkplayer-java/build.gradle +++ b/android/ijkplayer/ijkplayer-java/build.gradle @@ -11,7 +11,7 @@ android { abortOnError false } defaultConfig { - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion rootProject.ext.targetSdkVersion } buildTypes { diff --git a/android/ijkplayer/ijkplayer-java/src/main/AndroidManifest.xml b/android/ijkplayer/ijkplayer-java/src/main/AndroidManifest.xml index c87fe4705..c50dc8a4f 100644 --- a/android/ijkplayer/ijkplayer-java/src/main/AndroidManifest.xml +++ b/android/ijkplayer/ijkplayer-java/src/main/AndroidManifest.xml @@ -2,6 +2,6 @@ package="tv.danmaku.ijk.media.player" > + android:minSdkVersion="14" /> \ No newline at end of file diff --git a/android/ijkplayer/ijkplayer-x86/build.gradle b/android/ijkplayer/ijkplayer-x86/build.gradle index b3b7b3a8b..6c0915c93 100644 --- a/android/ijkplayer/ijkplayer-x86/build.gradle +++ b/android/ijkplayer/ijkplayer-x86/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion rootProject.ext.targetSdkVersion } buildTypes { diff --git a/android/ijkplayer/ijkplayer-x86/src/main/AndroidManifest.xml b/android/ijkplayer/ijkplayer-x86/src/main/AndroidManifest.xml index 68a12d04a..b81cc0f33 100644 --- a/android/ijkplayer/ijkplayer-x86/src/main/AndroidManifest.xml +++ b/android/ijkplayer/ijkplayer-x86/src/main/AndroidManifest.xml @@ -2,6 +2,6 @@ package="tv.danmaku.ijk.media.player_x86"> + android:minSdkVersion="14" /> diff --git a/config/module.sh_bkp b/config/module.sh_bkp new file mode 120000 index 000000000..0f16f539b --- /dev/null +++ b/config/module.sh_bkp @@ -0,0 +1 @@ +module-lite.sh \ No newline at end of file