Unified Diff: build.gradle
Issue 29784577:
Issue 6205 - Upload artifacs to maven repository (Closed)
Patch Set: Adjustments regarding comments
Created July 10, 2018, 12:39 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« adblock-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.java ('k')
|
gradle/wrapper/gradle-wrapper.properties » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: build.gradle |
| =================================================================== |
| --- a/build.gradle |
| +++ b/build.gradle |
| @@ -1,49 +1,36 @@ |
| -import java.util.regex.Matcher |
| -import java.util.regex.Pattern |
| - |
| -// ABI flavor of "adblock-android" module |
| -def getAbiFlavor() { |
| - Gradle gradle = getGradle() |
| - String taskReqStr = gradle.getStartParameter().getTaskRequests().toString() |
| - |
| - Pattern pattern; |
| - |
| - if (taskReqStr.contains("assemble")) { |
| - pattern = Pattern.compile("assemble(Abi_\\w{2,3})(Release|Debug)*(\\w*)") |
| - } else { |
| - pattern = Pattern.compile("generate(Abi_\\w{2,3})(Release|Debug)*(\\w*)") |
| +buildscript { |
| + repositories { |
| + google() |
| + jcenter() |
| } |
| - Matcher matcher = pattern.matcher(taskReqStr) |
| - |
| - if (matcher.find()) { |
| - return matcher.group(1).toLowerCase() |
| - } else { |
| - return "abi_all" |
| + dependencies { |
| + classpath 'com.android.tools.build:gradle:3.1.3' |
| + classpath 'com.novoda:bintray-release:0.8.1' |
| } |
| } |
| -buildscript { |
| - repositories { |
| - mavenLocal() |
| - mavenCentral() |
| - jcenter() |
| - } |
| - dependencies { |
| - classpath 'com.android.tools.build:gradle:2.3.0' |
| - } |
| +ext { |
| + bintrayUserOrg = 'adblockplus' |
| + bintrayGroupId = 'org.adblockplus' |
| + bintrayLicences = ['GPL-3.0'] |
| + bintrayWebsite = 'https://github.com/adblockplus/libadblockplus-android' |
| + bintrayIssueTracker = 'http://issues.adblockplus.org/' |
| + bintrayRepository = 'https://github.com/adblockplus/libadblockplus-android.git' |
| } |
| def gradleBuildDir = System.getenv('GRADLE_BUILD_DIR') |
| if (gradleBuildDir != null) { |
| println "[Configuration] Building project in ${gradleBuildDir}" |
| allprojects { |
| buildDir = "${gradleBuildDir}/${project.name}" |
| } |
| } |
| subprojects { |
| + repositories { |
| + google() |
| + jcenter() |
| + } |
| task listAllDependencies(type: DependencyReportTask) {} |
| } |
| - |
| -println "[Configuration] Using adblock-android ABI flavor: " + getAbiFlavor() |
« no previous file with comments
|
« adblock-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.java ('k')
|
gradle/wrapper/gradle-wrapper.properties » ('j')
|
no next file with comments »
