Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support latest Android Studio Chipmunk 2021.2.1 version. #5453

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support latest Android Studio Chipmunk 2021.2.1 version. #5453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions android/ijkplayer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

buildscript {
repositories {
jcenter()
mavenCentral()
google()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:3.2.1'

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

allprojects {
repositories {
jcenter()
mavenCentral()
google()
maven {
url "https://plugins.gradle.org/m2/"
}
}
}

ext {
compileSdkVersion = 25
buildToolsVersion = "25.0.3"
compileSdkVersion = 28
buildToolsVersion = "28.0.3"

targetSdkVersion = 25
targetSdkVersion = 28

versionCode = 800800
versionName = "0.8.8"
Expand Down
3 changes: 1 addition & 2 deletions android/ijkplayer/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Aug 24 16:26:25 CST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-arm64/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-armv5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-armv7a/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");
32 changes: 17 additions & 15 deletions android/ijkplayer/ijkplayer-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ android {
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
flavorDimensions "version"
productFlavors {
all32 { minSdkVersion 9 }
all64 { minSdkVersion 21 }
Expand All @@ -34,25 +36,25 @@ android {
}

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:23.0.1'
implementation 'com.android.support:preference-v7:23.0.1'
implementation 'com.android.support:support-annotations:23.0.1'

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')
all32Implementation project(':ijkplayer-armv5')
all32Implementation project(':ijkplayer-armv7a')
all32Implementation 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')
all64Implementation project(':ijkplayer-x86')
all64Implementation project(':ijkplayer-x86_64')

// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.8'
Expand Down
8 changes: 4 additions & 4 deletions android/ijkplayer/ijkplayer-exo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])

compile 'com.google.android.exoplayer:exoplayer:r1.5.11'
implementation 'com.google.android.exoplayer:exoplayer:r1.5.11'

compile project(':ijkplayer-java')
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
implementation project(':ijkplayer-java')
// implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
}

gradle.startParameter.taskNames.each { task ->
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-x86/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-x86_64/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

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