Skip to content

Commit

Permalink
切换下载源到jitpack
Browse files Browse the repository at this point in the history
  • Loading branch information
AnJoiner committed Apr 26, 2021
1 parent 75b8776 commit 8174117
Show file tree
Hide file tree
Showing 35 changed files with 123 additions and 1,818 deletions.
5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 17 additions & 5 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
> `FFmpegCommand`使用者:
>
> 首先感谢大家对此库的支持,感谢你们的使用才让我们有了继续开源下去的动力,感谢你们提出的问题,让这个库更加的完善。
>
>
> 在`1.2.0`之前提供了异步处理和多代码执行,但是很多人反馈,无法执行异步而且多代码用处不大,所以经过反复考虑将在`1.2.0`及之后的版本作出如下更改:
>
> * 取消`runCmdAsync``runCmdSync`方法,统一更改为`runCmd`执行`FFmpeg`命令
Expand Down Expand Up @@ -46,13 +46,25 @@

## 引入

下面两种引入只选择一种即可,并根据最新版本替换下面的`${latestVersion}`,当前最新版本[ ![Download](https://api.bintray.com/packages/sourfeng/repositories/ffmpeg/images/download.svg) ](https://bintray.com/sourfeng/repositories/ffmpeg/_latestVersion)
在项目根目录下找到`build.gradle`,并添加如下

```groovy
allprojects {
repositories {
...
maven { url 'https://jitpack.io' }
}
}
```

然后在`app`或者其他`module`下的`build.gradle`添加引入
下面两种引入只选择一种即可,并根据最新版本替换下面的`${latestVersion}`,当前最新版本[![](https://jitpack.io/v/AnJoiner/FFmpegCommand.svg)](https://jitpack.io/#AnJoiner/FFmpegCommand)

```groovy
// 全部编解码-体积较大
implementation 'com.coder.command:ffmpeg:${latestVersion}'
implementation 'com.github.AnJoiner:FFmpegCommand:1.2.0'
// 部分常用编解码-体积较小,比上面引入减少大约6M
implementation 'com.coder.command:ffmpeg-mini:${latestVersion}'
implementation 'com.github.AnJoiner:FFmpegCommand:1.2.0-lite'
```

更改module下build.gradle,当前库只支持`armeabi-v7a``arm64-v8a`,当然也可以只使用一种(一般使用`armeabi-v7a`可以向下兼容),可以参考[【Android ABI】](https://developer.android.com/ndk/guides/abis)
Expand All @@ -68,7 +80,7 @@ android {
}
```

**如果没有特别的编解码需求,强烈推荐建议使用`ffmpeg-mini`**
**如果没有特别的编解码需求,强烈推荐建议使用`ffmpeg-lite`**

<font size=2>当然如果有特别的编解码需求,或者对包的大小有超高要求的,可以通过下方的群联系我进行私人定制。当然这个定制是**有偿的**,毕竟撸码不易,光阴似箭~~</font>

Expand Down
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,24 @@ If you can’t access all the information, please go to[【Domestic Mirror】](h

## Introduce

Choose only one of the following two introductions, and replace the following according to the latest version `${latestVersion}`,Current latest version[ ![Download](https://api.bintray.com/packages/sourfeng/repositories/ffmpeg/images/download.svg) ](https://bintray.com/sourfeng/repositories/ffmpeg/_latestVersion)
Find `build.gradle` in the project root directory and add the following:

```groovy
allprojects {
repositories {
...
maven { url 'https://jitpack.io' }
}
}
```
Then add the import in `build.gradle` in `app` or other `module` directory
Choose only one of the following two introductions, and replace the following according to the latest version `${latestVersion}`,Current latest version[![](https://jitpack.io/v/AnJoiner/FFmpegCommand.svg)](https://jitpack.io/#AnJoiner/FFmpegCommand)

```groovy
// All codecs-larger size
implementation 'com.coder.command:ffmpeg:${latestVersion}'
implementation 'com.github.AnJoiner:FFmpegCommand:1.2.0'
// Some commonly used codecs-smaller in size, about 6M less than the introduction above
implementation 'com.coder.command:ffmpeg-mini:${latestVersion}'
implementation 'com.github.AnJoiner:FFmpegCommand:1.2.0-lite'
```

Change build.gradle under module, the current library only supports `armeabi-v7a` and `arm64-v8a`, of course you can use only one (usually using `armeabi-v7a` for backward compatibility). You can Can refer to [【Android ABI】](https://developer.android.com/ndk/guides/abis)
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation project(path: ':ffmpeg-lite')
// implementation 'com.coder.command:ffmpeg-lite:0.0.1'
// implementation 'com.cli.ffmpeg:command-android-lite:0.0.1'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
// 腾讯bugly
implementation 'com.tencent.bugly:crashreport:3.3.1'
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ buildscript {
repositories {
google()
jcenter()

}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -23,7 +21,9 @@ allprojects {
repositories {
google()
jcenter()

maven{
url 'http://www.readdown.com:8081/repository/maven-releases/'
}
}
}

Expand Down
96 changes: 0 additions & 96 deletions ffmpeg-lite/bintray.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion ffmpeg-lite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

apply from: 'bintray.gradle'
apply from: 'nexus.gradle'
}
40 changes: 40 additions & 0 deletions ffmpeg-lite/nexus.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
apply plugin: 'maven'


task androidJavadocs(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}

task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
classifier = 'javadoc'
from androidJavadocs.destinationDir
}

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

artifacts {
archives androidSourcesJar
}

Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

uploadArchives {
configuration = configurations.archives
repositories{
mavenDeployer {
repository(url: 'http://www.readdown.com:8081/repository/maven-releases/') {
authentication(userName: properties.getProperty("nexus.user"), password: properties.getProperty("nexus.password"))
}
pom.version = "0.0.1"
pom.artifactId = "command-android-lite"
pom.groupId = "com.cli.ffmpeg"
pom.name = "command-android-lite"
pom.packaging = 'aar'
}
}
}
1 change: 0 additions & 1 deletion ffmpeg-mini/.gitignore

This file was deleted.

96 changes: 0 additions & 96 deletions ffmpeg-mini/bintray.gradle

This file was deleted.

Loading

0 comments on commit 8174117

Please sign in to comment.