54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
|
From e8af401baf53d5d08b40d89f991585e072e5fee4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Srb <msrb@redhat.com>
|
||
|
|
Date: Thu, 22 Jan 2015 14:06:56 +0100
|
||
|
|
Subject: [PATCH 4/6] Remove android support
|
||
|
|
|
||
|
|
---
|
||
|
|
build.gradle | 1 -
|
||
|
|
gradle/assemble.gradle | 17 -----------------
|
||
|
|
2 files changed, 18 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/build.gradle b/build.gradle
|
||
|
|
index fdbe73b..c3cf24b 100644
|
||
|
|
--- a/build.gradle
|
||
|
|
+++ b/build.gradle
|
||
|
|
@@ -146,7 +146,6 @@ dependencies {
|
||
|
|
exclude(group: 'junit', module: 'junit')
|
||
|
|
exclude(group: 'jmock', module: 'jmock')
|
||
|
|
}
|
||
|
|
- compile "com.googlecode:openbeans:$openbeansVersion"
|
||
|
|
compile "org.fusesource.jansi:jansi:$jansiVersion"
|
||
|
|
compile("org.apache.ivy:ivy:$ivyVersion") {
|
||
|
|
transitive = false
|
||
|
|
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
|
||
|
|
index 20d74d6..1b5ded9 100644
|
||
|
|
--- a/gradle/assemble.gradle
|
||
|
|
+++ b/gradle/assemble.gradle
|
||
|
|
@@ -237,23 +237,6 @@ allprojects {
|
||
|
|
def target = new File("${archivePath}.tmp")
|
||
|
|
boolean isRootProject = project==rootProject
|
||
|
|
|
||
|
|
- doFirst {
|
||
|
|
- from zipTree(target)
|
||
|
|
- ant {
|
||
|
|
- taskdef name: 'jarjar', classname: 'com.tonicsystems.jarjar.JarJarTask', classpath: rootProject.configurations.tools.asPath
|
||
|
|
- jarjar(jarfile: target) {
|
||
|
|
- zipfileset(dir: "$rootProject.projectDir/notices/", includes: isRootProject ? 'NOTICE-GROOIDJARJAR' : 'NOTICE-GROOID', fullpath: 'META-INF/NOTICE')
|
||
|
|
- zipfileset(src: jarjar.archivePath, excludes: 'META-INF/NOTICE')
|
||
|
|
- if (isRootProject) {
|
||
|
|
- zipfileset(src: rootProject.configurations.runtime.files.find { it.name.startsWith('openbeans') }, excludes: 'META-INF/*')
|
||
|
|
- }
|
||
|
|
- rule pattern: 'com.googlecode.openbeans.**', result: 'groovyjarjaropenbeans.@1'
|
||
|
|
- rule pattern: 'org.apache.harmony.beans.**', result: 'groovyjarjarharmonybeans.@1'
|
||
|
|
- rule pattern: 'java.beans.**', result: 'groovyjarjaropenbeans.@1'
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- }
|
||
|
|
doLast {
|
||
|
|
target.delete()
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|