diff options
| author | Yigit Boyar <yboyar@google.com> | 2015-10-30 10:05:15 -0700 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2015-10-30 10:05:15 -0700 |
| commit | 0a39d327fc5dedb0a766f1ad44d7b1fc7048ef84 (patch) | |
| tree | b13f85b3c3a2b5a551a85685f460dcf7c10a3fab /build.gradle | |
| parent | 02added29288636abb4bc0bea9105e240b6e3979 (diff) | |
| download | data-binding-0a39d327fc5dedb0a766f1ad44d7b1fc7048ef84.tar.gz | |
Update notice
Change-Id: I3d5e2a07075603fbc2ee9b6c93490f6ea2d7c594
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 00b12068..35ce3b65 100644 --- a/build.gradle +++ b/build.gradle @@ -168,7 +168,7 @@ def fullJar(project) { localizeTask.dependsOn project.tasks.findByName('buildLicenseNotice') } - if (!dataBindingConfig.inReleaseBuild || !dataBindingConfig.runProguard) { + if (!dataBindingConfig.runProguard) { return } def jarName = project.uploadArchives.repositories.mavenDeployer.pom.artifactId @@ -192,7 +192,7 @@ def fullJar(project) { deps.addAll(it.allModuleArtifacts) } } - from { deps.findAll { !it.name.contains('baseLibrary')}.collect { + from { deps.findAll { !it.name.contains('baseLibrary') && !it.name.contains("juniversalchardet")}.collect { it.file.isDirectory() ? it.file : project.zipTree(it.file) } } { exclude "META-INF/maven/**" @@ -238,6 +238,7 @@ def fullJar(project) { // rule to repackage antlr to new package rule pattern: 'org.antlr.**', result: 'com.google.repacked.antlr.@1' rule pattern: 'com.tunnelvisionlabs.**', result: 'com.google.repacked.tunnelvision.@1' + rule pattern: 'org.abego.treelayout.**', result: 'com.google.repacked.treelayout.@1' // rule to repackage commons rule pattern: 'org.apache.**', result: 'com.google.repacked.apache.@1' rule pattern: 'kotlin.**', result: 'com.google.repacked.kotlin.@1' @@ -255,7 +256,9 @@ def fullJar(project) { dep.artifactId == 'baseLibrary' def isGradle = dep.groupId == 'com.android.tools.build' && dep.artifactId == 'gradle' - return !isBaseLibrary && !isGradle + def isChardet = dep.groupId == 'com.googlecode.juniversalchardet' && + dep.artifactId == 'juniversalchardet' + return !isBaseLibrary && !isGradle && !isChardet } } } |