Skip to content

Commit

Permalink
release v3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Doikki committed Apr 20, 2021
1 parent baf7fb5 commit 1a3a819
Show file tree
Hide file tree
Showing 13 changed files with 142 additions and 34 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DKVideoPlayer
A video player for Android.

[![JCenter](https://api.bintray.com/packages/dueeeke/maven/dkplayer-java/images/download.svg)](https://bintray.com/dueeeke/maven/dkplayer-java/_latestVersion)
![Maven Central](https://img.shields.io/maven-central/v/xyz.doikki.android.dkplayer/dkplayer-java)
[![API](https://img.shields.io/badge/API-16%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=16)

### [Demo](https://d.alphaqr.com/1r3u)
Expand Down
10 changes: 7 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ buildscript {
repositories {
google()
jcenter()
mavenCentral()
// mavenLocal()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.novoda:bintray-release:0.9.2'
classpath 'com.android.tools.build:gradle:4.1.3'
// maven publish tool
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.30'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -18,6 +20,8 @@ allprojects {
repositories {
google()
jcenter()
mavenCentral()
// mavenLocal()
}
}

Expand Down
9 changes: 4 additions & 5 deletions constants.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
project.ext {
releaseVersion = '3.2.6'
releaseVersionCode = 47
releaseVersion = '3.3.0'
releaseVersionCode = 48

minSdkVersion = 16
targetSdkVersion = 29
compileSdkVersion = 29
targetSdkVersion = 30
compileSdkVersion = 30
buildToolsVersion = '28.0.3'

// App dependencies
ijkPlayerVersion = '0.8.8'
exoPlayerVersion = '2.13.3'

annotation = 'androidx.annotation:annotation:1.1.0'
Expand Down
2 changes: 1 addition & 1 deletion dkplayer-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
}

ext {
releaseArtifact = 'dkplayer-java'
PUBLISH_ARTIFACT_ID = 'dkplayer-java'
}

apply from: '../publish.gradle'
2 changes: 1 addition & 1 deletion dkplayer-players/exo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
}

ext {
releaseArtifact = 'player-exo'
PUBLISH_ARTIFACT_ID = 'player-exo'
}

apply from: '../../publish.gradle'
2 changes: 1 addition & 1 deletion dkplayer-players/ijk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
}

ext {
releaseArtifact = 'player-ijk'
PUBLISH_ARTIFACT_ID = 'player-ijk'
}

apply from: '../../publish.gradle'
10 changes: 5 additions & 5 deletions dkplayer-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ dependencies {
implementation project(':dkplayer-videocache')


// implementation 'com.github.dueeeke.dkplayer:dkplayer-java:3.2.6'
// implementation 'com.github.dueeeke.dkplayer:dkplayer-ui:3.2.6'
// implementation 'com.github.dueeeke.dkplayer:player-exo:3.2.6'
// implementation 'com.github.dueeeke.dkplayer:player-ijk:3.2.6'
// implementation 'com.github.dueeeke.dkplayer:videocache:3.2.6'
// implementation 'xyz.doikki.android.dkplayer:dkplayer-java:3.3.0'
// implementation 'xyz.doikki.android.dkplayer:dkplayer-ui:3.3.0'
// implementation 'xyz.doikki.android.dkplayer:player-exo:3.3.0'
// implementation 'xyz.doikki.android.dkplayer:player-ijk:3.3.0'
// implementation 'xyz.doikki.android.dkplayer:videocache:3.3.0'
}
1 change: 1 addition & 0 deletions dkplayer-sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
android:requestLegacyExternalStorage="true"
android:allowNativeHeapPointerTagging="true"
tools:ignore="LockedOrientationActivity">

<!--允许绘制到oppo、vivo刘海屏机型的刘海区域 -->
Expand Down
2 changes: 1 addition & 1 deletion dkplayer-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
}

ext {
releaseArtifact = 'dkplayer-ui'
PUBLISH_ARTIFACT_ID = 'dkplayer-ui'
}

apply from: '../publish.gradle'
2 changes: 1 addition & 1 deletion dkplayer-videocache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {
}

ext {
releaseArtifact = 'videocache'
PUBLISH_ARTIFACT_ID = 'videocache'
}

apply from: '../publish.gradle'
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@
*/
public class ProxyCacheException extends Exception {

private static final String LIBRARY_VERSION = ". Version: " + BuildConfig.VERSION_NAME;

public ProxyCacheException(String message) {
super(message + LIBRARY_VERSION);
super(message);
}

public ProxyCacheException(String message, Throwable cause) {
super(message + LIBRARY_VERSION, cause);
super(message, cause);
}

public ProxyCacheException(Throwable cause) {
super("No explanation error" + LIBRARY_VERSION, cause);
super("No explanation error", cause);
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Sep 27 14:30:56 CST 2019
#Tue Apr 20 23:16:41 CST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
122 changes: 114 additions & 8 deletions publish.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,115 @@
apply plugin: 'bintray-release'
publish {
artifactId = releaseArtifact
desc = 'A video player for Android.'
publishVersion = releaseVersion
userOrg = 'dueeeke'
groupId = 'com.github.dueeeke.dkplayer'
website = 'https://github.com/dueeeke/dkplayer'
apply plugin: 'maven-publish'
apply plugin: 'signing'

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.source

exclude "**/R.class"
exclude "**/BuildConfig.class"
}

ext {
PUBLISH_GROUP_ID = 'xyz.doikki.android.dkplayer'
PUBLISH_VERSION = project.ext.releaseVersion
}

ext["signing.keyId"] = ''
ext["signing.password"] = ''
ext["signing.secretKeyRingFile"] = ''
ext["ossrhUsername"] = ''
ext["ossrhPassword"] = ''

File secretPropsFile = project.rootProject.file('local.properties')
if (secretPropsFile.exists()) {
println "Found secret props file, loading props"
Properties p = new Properties()
p.load(new FileInputStream(secretPropsFile))
p.each { name, value ->
ext[name] = value
}
} else {
println "No props file, loading env vars"
}
publishing {
publications {
release(MavenPublication) {
// The coordinates of the library, being set from variables that
// we'll set up in a moment
groupId PUBLISH_GROUP_ID
artifactId PUBLISH_ARTIFACT_ID
version PUBLISH_VERSION

// Two artifacts, the `aar` and the sources
artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
artifact androidSourcesJar

// Self-explanatory metadata for the most part
pom {
name = PUBLISH_ARTIFACT_ID
description = 'A video player for Android.'
// If your project has a dedicated site, use its URL here
url = 'https://github.com/Doikki/DKVideoPlayer'
licenses {
license {
//协议类型,一般默认Apache License2.0的话不用改:
name = 'The Apache License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers {
developer {
id = 'Doikki'
name = 'Doikki'
email = '[email protected]'
}
}
// Version control info, if you're using GitHub, follow the format as seen here
scm {
connection = 'scm:git:github.com/Doikki/DKVideoPlayer.git'
developerConnection = 'scm:git:ssh://github.com/Doikki/DKVideoPlayer.git'
url = 'https://github.com/Doikki/DKVideoPlayer/tree/master'
}
// A slightly hacky fix so that your POM will include any transitive dependencies
// that your library builds upon
withXml {
def dependenciesNode = asNode().appendNode('dependencies')

project.configurations.implementation.allDependencies.each {
if (it.group != "unspecified"
&& it.name != "unspecified"
&& it.version != "unspecified") {
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', it.group)
dependencyNode.appendNode('artifactId', it.name)
dependencyNode.appendNode('version', it.version)
}
}
}
}
}
}
repositories {
// The repository to publish to, Sonatype/MavenCentral
maven {
// This is an arbitrary name, you may also use "mavencentral" or
// any other name that's descriptive for you
name = "mavenCentral"

def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
// You only need this if you want to publish snapshots, otherwise just set the URL
// to the release repo directly
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl

// The username and password we've fetched earlier
credentials {
username ossrhUsername
password ossrhPassword
}
}
}
}
signing {
sign publishing.publications
}

0 comments on commit 1a3a819

Please sign in to comment.