Skip to content

Commit b042e79

Browse files
author
wangjian16
committed
support latest Android Studio Chipmunk 2021.2.1 version.
1 parent 30eb944 commit b042e79

File tree

10 files changed

+42
-33
lines changed

10 files changed

+42
-33
lines changed

android/ijkplayer/build.gradle

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
6+
google()
7+
maven {
8+
url "https://plugins.gradle.org/m2/"
9+
}
610
}
711
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.3'
12+
classpath 'com.android.tools.build:gradle:3.2.1'
913

1014
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
1115
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
@@ -16,15 +20,19 @@ buildscript {
1620

1721
allprojects {
1822
repositories {
19-
jcenter()
23+
mavenCentral()
24+
google()
25+
maven {
26+
url "https://plugins.gradle.org/m2/"
27+
}
2028
}
2129
}
2230

2331
ext {
24-
compileSdkVersion = 25
25-
buildToolsVersion = "25.0.3"
32+
compileSdkVersion = 28
33+
buildToolsVersion = "28.0.3"
2634

27-
targetSdkVersion = 25
35+
targetSdkVersion = 28
2836

2937
versionCode = 800800
3038
versionName = "0.8.8"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Aug 24 16:26:25 CST 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

android/ijkplayer/ijkplayer-arm64/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-armv5/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-armv7a/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-example/build.gradle

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ android {
1717
versionCode rootProject.ext.versionCode
1818
versionName rootProject.ext.versionName
1919
}
20+
2021
buildTypes {
2122
release {
2223
minifyEnabled false
2324
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2425
}
2526
}
27+
flavorDimensions "version"
2628
productFlavors {
2729
all32 { minSdkVersion 9 }
2830
all64 { minSdkVersion 21 }
@@ -34,25 +36,25 @@ android {
3436
}
3537

3638
dependencies {
37-
compile fileTree(include: ['*.jar'], dir: 'libs')
38-
compile 'com.android.support:appcompat-v7:23.0.1'
39-
compile 'com.android.support:preference-v7:23.0.1'
40-
compile 'com.android.support:support-annotations:23.0.1'
39+
implementation fileTree(include: ['*.jar'], dir: 'libs')
40+
implementation 'com.android.support:appcompat-v7:23.0.1'
41+
implementation 'com.android.support:preference-v7:23.0.1'
42+
implementation 'com.android.support:support-annotations:23.0.1'
4143

42-
compile 'com.squareup:otto:1.3.8'
44+
implementation 'com.squareup:otto:1.3.8'
4345

44-
compile project(':ijkplayer-java')
45-
compile project(':ijkplayer-exo')
46+
implementation project(':ijkplayer-java')
47+
implementation project(':ijkplayer-exo')
4648

47-
all32Compile project(':ijkplayer-armv5')
48-
all32Compile project(':ijkplayer-armv7a')
49-
all32Compile project(':ijkplayer-x86')
49+
all32Implementation project(':ijkplayer-armv5')
50+
all32Implementation project(':ijkplayer-armv7a')
51+
all32Implementation project(':ijkplayer-x86')
5052

51-
all64Compile project(':ijkplayer-armv5')
52-
all64Compile project(':ijkplayer-armv7a')
53-
all64Compile project(':ijkplayer-arm64')
54-
all64Compile project(':ijkplayer-x86')
55-
all64Compile project(':ijkplayer-x86_64')
53+
all64Implementation project(':ijkplayer-armv5')
54+
all64Implementation project(':ijkplayer-armv7a')
55+
all64Implementation project(':ijkplayer-arm64')
56+
all64Implementation project(':ijkplayer-x86')
57+
all64Implementation project(':ijkplayer-x86_64')
5658

5759
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
5860
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.8'

android/ijkplayer/ijkplayer-exo/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ android {
2323
}
2424

2525
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
26+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727

28-
compile 'com.google.android.exoplayer:exoplayer:r1.5.11'
28+
implementation 'com.google.android.exoplayer:exoplayer:r1.5.11'
2929

30-
compile project(':ijkplayer-java')
31-
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
30+
implementation project(':ijkplayer-java')
31+
// implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
3232
}
3333

3434
gradle.startParameter.taskNames.each { task ->

android/ijkplayer/ijkplayer-java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ android {
2323
}
2424

2525
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
26+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727
}
2828

2929
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-x86/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-x86_64/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

0 commit comments

Comments
 (0)