Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Cleanup build
  • Loading branch information
hannesa2 committed Jul 31, 2021
commit 67c2d40b3002675b016dceab4d0bf9fb266960c8
100 changes: 2 additions & 98 deletions FFmpegAndroid/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: "com.jfrog.bintray"

// This is the library version used when deploying the artifact
version = VERSION_NAME

android {
compileSdkVersion rootProject.ext.compileSdkVersion as Integer
buildToolsVersion rootProject.ext.buildToolsVersion as String

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion as Integer
Expand All @@ -31,97 +25,7 @@ android {
}

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

androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0'
}

group = GROUP

install {
repositories.mavenInstaller {
// This generates POM.xml with proper parameters
pom {
project {
packaging POM_PACKAGING

// Add your description here
name 'FFmpeg Android'
description = POM_DESCRIPTION
url POM_URL

// Set your license
licenses {
license {
name POM_LICENCE_NAME
url POM_LICENCE_URL
}
}
developers {
developer {
id POM_DEVELOPER_ID
name POM_DEVELOPER_NAME
email '[email protected]'
}
}
scm {
connection POM_SCM_URL
developerConnection POM_SCM_URL
url POM_URL

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

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

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

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
artifacts {
archives javadocJar
archives sourcesJar
}

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

// https://github.com/bintray/gradle-bintray-plugin
bintray {
user = properties.getProperty("bintray.user")
key = properties.getProperty("bintray.apikey")

configurations = ['archives']
pkg {
repo = "maven"
// it is the name that appears in bintray when logged
name = "ffmpeg-android"
websiteUrl = POM_URL
vcsUrl = POM_SCM_URL
licenses = ["GPL-3.0"]
publish = true
version {
gpg {
sign = true
passphrase = properties.getProperty("bintray.gpg.password")
}
mavenCentralSync {
sync = true
user = properties.getProperty("bintray.oss.user") //OSS user token
password = properties.getProperty("bintray.oss.password") //OSS user password
close = '1'
}
}
}
androidTestImplementation 'com.squareup.assertj:assertj-android:1.0.0'
}
15 changes: 7 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
apply plugin: 'com.android.application'
plugins {
id 'com.android.application'
}

android {
compileSdkVersion rootProject.ext.compileSdkVersion as Integer
buildToolsVersion rootProject.ext.buildToolsVersion as String

defaultConfig {
applicationId "com.github.hiteshsondhi88.sampleffmpeg"
Expand Down Expand Up @@ -31,10 +32,8 @@ android {
}

dependencies {
compile 'com.squareup.dagger:dagger-compiler:1.2.2'
compile 'com.squareup.dagger:dagger:1.2.2'
compile 'com.jakewharton:butterknife:5.1.2'
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0'
compile project(':FFmpegAndroid')
implementation 'com.jakewharton:butterknife:5.1.2'
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation 'com.squareup.assertj:assertj-android:1.0.0'
implementation project(':FFmpegAndroid')
}
7 changes: 1 addition & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}

Expand All @@ -25,7 +21,6 @@ allprojects {

ext {
compileSdkVersion = 22
buildToolsVersion = '22.0.1'
targetSdkVersion = 22
minSdkVersion = 16
versionCode = 28
Expand Down