Unified Diff: adblock-android/build.gradle
Issue 29784577:
Issue 6205 - Upload artifacs to maven repository (Closed)
Patch Set: Several adjustments
Created July 9, 2018, 3:53 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« adblock-android/AndroidManifest.xml ('K')
|
« adblock-android/AndroidManifest.xml ('k')
|
adblock-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.java » ('j')
|
adblock-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: adblock-android/build.gradle |
| =================================================================== |
| --- a/adblock-android/build.gradle |
| +++ b/adblock-android/build.gradle |
| @@ -1,49 +1,51 @@ |
| apply plugin: 'com.android.library' |
| +apply plugin: 'com.novoda.bintray-release' |
| android { |
| compileSdkVersion 16 |
| - buildToolsVersion "25.0.0" |
| + buildToolsVersion '27.0.3' |
| defaultConfig { |
| minSdkVersion 16 |
| targetSdkVersion 16 |
| - versionCode 6 |
| - versionName "3.0" |
| } |
| - publishNonDefault true |
| + flavorDimensions "abi" |
| productFlavors { |
| abi_arm { |
| + dimension = "abi" |
| ndk { |
| abiFilters "armeabi-v7a" |
| } |
| externalNativeBuild { |
| ndkBuild { |
| arguments "APP_ABI=armeabi-v7a" |
| } |
| } |
| } |
| abi_x86 { |
| + dimension = "abi" |
| ndk { |
| abiFilters "x86" |
| } |
| externalNativeBuild { |
| ndkBuild { |
| arguments "APP_ABI=x86" |
| } |
| } |
| } |
| abi_all { |
| + dimension = "abi" |
| ndk { |
| abiFilters 'armeabi-v7a', 'x86' |
| } |
| } |
| } |
| externalNativeBuild { |
| ndkBuild { |
| @@ -55,16 +57,29 @@ |
| main { |
| manifest.srcFile 'AndroidManifest.xml' |
| java.srcDirs = ['src'] |
| res.srcDirs = ['res'] |
| jni.srcDirs = ['jni'] |
| } |
| } |
| + publish { |
| + userOrg = rootProject.ext.bintrayUserOrg |
| + groupId = rootProject.ext.bintrayGroupId |
| + artifactId = 'adblock-android' |
| + publishVersion = '3.0' |
| + licences = rootProject.ext.bintrayLicences |
| + desc = 'An Android library that provides the core functionality of Adblock Plus.' |
| + website = rootProject.ext.bintrayWebsite |
| + issueTracker = rootProject.ext.bintrayIssueTracker |
| + repository = rootProject.ext.bintrayRepository |
| + publications = ['abi_allRelease'] |
| + } |
| + |
| def sharedV8LibFiles = System.getenv('SHARED_V8_LIB_FILENAMES') |
| if (sharedV8LibFiles != null) { |
| def sharedV8LibFilesSet = [] |
| def sharedV8LibFilesArray = sharedV8LibFiles.split(' ') |
| sharedV8LibFilesArray.each { eachFileName -> |
| sharedV8LibFilesSet.add("**/" + eachFileName) |
| println "[Configuration] Excluding shared v8 library " + eachFileName + " from AAR" |
| } |
« adblock-android/AndroidManifest.xml ('K')
|
« adblock-android/AndroidManifest.xml ('k')
|
adblock-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.java » ('j')
|
adblock-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.java » ('J')
