diff --git a/tools/release/android.sh b/tools/release/android.sh index f1c1065e1..73c5aee0e 100755 --- a/tools/release/android.sh +++ b/tools/release/android.sh @@ -51,7 +51,7 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-min -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 without any external libraries enabled.' clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-min -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 without any external libraries enabled.' clean install || exit 1 create_package "min" "$2" || exit 1 # MIN-GPL RELEASE @@ -60,7 +60,7 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} ${GPL_PACKAGES} || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-min-gpl -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with libvid.stab v1.1.0, x264 v20200409-stable, x265 v3.3 and xvidcore v1.3.7 libraries enabled.' -PreleaseGPL=1 clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-min-gpl -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with libvid.stab v1.1.0, x264 v20200409-stable, x265 v3.3 and xvidcore v1.3.7 libraries enabled.' -PreleaseGPL=1 clean install || exit 1 create_package "min-gpl" "$2" || exit 1 # HTTPS RELEASE @@ -69,7 +69,7 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} --enable-gnutls --enable-gmp || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-https -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with gmp v6.2.0 and gnutls v3.6.13 library enabled.' clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-https -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with gmp v6.2.0 and gnutls v3.6.13 library enabled.' clean install || exit 1 create_package "https" "$2" || exit 1 # HTTPS-GPL RELEASE @@ -78,7 +78,7 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} --enable-gnutls --enable-gmp ${GPL_PACKAGES} || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-https-gpl -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with gmp v6.2.0, gnutls v3.6.13, libvid.stab v1.1.0, x264 v20200409-stable, x265 v3.3 and xvidcore v1.3.7 libraries enabled.' -PreleaseGPL=1 clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-https-gpl -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with gmp v6.2.0, gnutls v3.6.13, libvid.stab v1.1.0, x264 v20200409-stable, x265 v3.3 and xvidcore v1.3.7 libraries enabled.' -PreleaseGPL=1 clean install || exit 1 create_package "https-gpl" "$2" || exit 1 # AUDIO RELEASE @@ -87,7 +87,7 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} --enable-lame --enable-libilbc --enable-libvorbis --enable-opencore-amr --enable-opus --enable-shine --enable-soxr --enable-speex --enable-twolame --enable-wavpack || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-audio -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with lame v3.100, libilbc v2.0.2, libvorbis v1.3.6, opencore-amr v0.1.5, opus v1.3.1, shine v3.1.1, soxr v0.1.3, speex v1.2.0, twolame v0.4 and wavpack v5.2.0 libraries enabled.' clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-audio -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with lame v3.100, libilbc v2.0.2, libvorbis v1.3.6, opencore-amr v0.1.5, opus v1.3.1, shine v3.1.1, soxr v0.1.3, speex v1.2.0, twolame v0.4 and wavpack v5.2.0 libraries enabled.' clean install || exit 1 create_package "audio" "$2" || exit 1 # VIDEO RELEASE @@ -96,7 +96,7 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} --enable-fontconfig --enable-freetype --enable-fribidi --enable-kvazaar --enable-libaom --enable-libass --enable-libiconv --enable-libtheora --enable-libvpx --enable-snappy --enable-libwebp || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-video -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with fontconfig v2.13.92, freetype v2.10.1, fribidi v1.0.9, kvazaar v1.3.0, libaom v1.0.0-errata1-avif-110, libass v0.14.0, libiconv v1.16, libtheora v1.1.1, libvpx v1.8.2, snappy v1.1.8 and libwebp v1.1.0 libraries enabled.' clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-video -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with fontconfig v2.13.92, freetype v2.10.1, fribidi v1.0.9, kvazaar v1.3.0, libaom v1.0.0-errata1-avif-110, libass v0.14.0, libiconv v1.16, libtheora v1.1.1, libvpx v1.8.2, snappy v1.1.8 and libwebp v1.1.0 libraries enabled.' clean install || exit 1 create_package "video" "$2" || exit 1 # FULL RELEASE @@ -105,7 +105,7 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} ${FULL_PACKAGES} || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-full -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with fontconfig v2.13.92, freetype v2.10.1, fribidi v1.0.9, gmp v6.2.0, gnutls v3.6.13, kvazaar v1.3.0, lame v3.100, libaom v1.0.0-errata1-avif-110, libass v0.14.0, libiconv v1.16, libilbc v2.0.2, libtheora v1.1.1, libvorbis v1.3.6, libvpx v1.8.2, libwebp v1.1.0, libxml2 v2.9.10, opencore-amr v0.1.5, opus v1.3.1, shine v3.1.1, snappy v1.1.8, soxr v0.1.3, speex v1.2.0, twolame v0.4 and wavpack v5.2.0 libraries enabled.' clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-full -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with fontconfig v2.13.92, freetype v2.10.1, fribidi v1.0.9, gmp v6.2.0, gnutls v3.6.13, kvazaar v1.3.0, lame v3.100, libaom v1.0.0-errata1-avif-110, libass v0.14.0, libiconv v1.16, libilbc v2.0.2, libtheora v1.1.1, libvorbis v1.3.6, libvpx v1.8.2, libwebp v1.1.0, libxml2 v2.9.10, opencore-amr v0.1.5, opus v1.3.1, shine v3.1.1, snappy v1.1.8, soxr v0.1.3, speex v1.2.0, twolame v0.4 and wavpack v5.2.0 libraries enabled.' clean install || exit 1 create_package "full" "$2" || exit 1 # FULL-GPL RELEASE @@ -114,6 +114,6 @@ cd ${BASEDIR}/../.. || exit 1 ./android.sh ${CUSTOM_OPTIONS} ${FULL_PACKAGES} ${GPL_PACKAGES} || exit 1 cd ${BASEDIR}/../../android/app || exit 1 enable_gradle_release -gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-full-gpl -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with fontconfig v2.13.92, freetype v2.10.1, fribidi v1.0.9, gmp v6.2.0, gnutls v3.6.13, kvazaar v1.3.0, lame v3.100, libaom v1.0.0-errata1-avif-110, libass v0.14.0, libiconv v1.16, libilbc v2.0.2, libtheora v1.1.1, libvid.stab v1.1.0, libvorbis v1.3.6, libvpx v1.8.2, libwebp v1.1.0, libxml2 v2.9.10, opencore-amr v0.1.5, opus v1.3.1, shine v3.1.1, snappy v1.1.8, soxr v0.1.3, speex v1.2.0, twolame v0.4, wavpack v5.2.0, x264 v20200409-stable, x265 v3.3 and xvidcore v1.3.7 libraries enabled.' -PreleaseGPL=1 clean install bintrayUpload || exit 1 +gradle -p ${BASEDIR}/../../android/app -PreleaseVersionCode=$1 -PreleaseVersionName=$2 -PreleaseMinSdk=24 -PreleaseTargetSdk=29 -PreleaseProject=mobile-ffmpeg-full-gpl -PreleaseProjectDescription='Includes FFmpeg v4.3-dev-2955 with fontconfig v2.13.92, freetype v2.10.1, fribidi v1.0.9, gmp v6.2.0, gnutls v3.6.13, kvazaar v1.3.0, lame v3.100, libaom v1.0.0-errata1-avif-110, libass v0.14.0, libiconv v1.16, libilbc v2.0.2, libtheora v1.1.1, libvid.stab v1.1.0, libvorbis v1.3.6, libvpx v1.8.2, libwebp v1.1.0, libxml2 v2.9.10, opencore-amr v0.1.5, opus v1.3.1, shine v3.1.1, snappy v1.1.8, soxr v0.1.3, speex v1.2.0, twolame v0.4, wavpack v5.2.0, x264 v20200409-stable, x265 v3.3 and xvidcore v1.3.7 libraries enabled.' -PreleaseGPL=1 clean install || exit 1 create_package "full-gpl" "$2" || exit 1 enable_gradle_build \ No newline at end of file diff --git a/tools/release/android/release.template.gradle b/tools/release/android/release.template.gradle index 7e5264ccc..81ea01c5d 100644 --- a/tools/release/android/release.template.gradle +++ b/tools/release/android/release.template.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' buildscript { repositories { @@ -8,8 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' + classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -52,9 +50,6 @@ android { } ext { - bintrayRepo = 'maven' - bintrayName = releaseProject - publishedGroupId = 'com.arthenica' libraryName = releaseProject artifact = releaseProject @@ -118,32 +113,6 @@ install { } } -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) - -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - pkg { - repo = bintrayRepo - name = bintrayName - desc = libraryDescription - websiteUrl = siteUrl - vcsUrl = gitUrl - issueTrackerUrl = issueTrackerUrl - licenses = allLicenses - dryRun = true - publish = false - override = false - publicDownloadNumbers = false - version { - desc = libraryDescription - } - } -} - task sourcesJar(type: Jar) { archiveClassifier.set('sources') from android.sourceSets.main.java.srcDirs