[android-platform-tools-base] 13/30: Auto-generate POMs with Gradle
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Fri Jul 22 10:33:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository android-platform-tools-base.
commit 6d6e0ec9d9d7858af45a9b134577900452698166
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Thu Jul 21 17:44:48 2016 +0800
Auto-generate POMs with Gradle
---
debian/android-platform-tools-base.poms | 2 ++
debian/debian.gradle | 38 +++++++++++++++++++++++++
debian/libandroid-tools-annotations-java.poms | 2 +-
debian/libandroid-tools-common-java.poms | 2 +-
debian/poms/android-tools-annotations-pom.xml | 26 -----------------
debian/poms/android-tools-common-pom.xml | 40 ---------------------------
debian/settings.gradle | 2 --
7 files changed, 42 insertions(+), 70 deletions(-)
diff --git a/debian/android-platform-tools-base.poms b/debian/android-platform-tools-base.poms
new file mode 100644
index 0000000..7febf18
--- /dev/null
+++ b/debian/android-platform-tools-base.poms
@@ -0,0 +1,2 @@
+draw9patch/build/draw9patch.pom --java-lib --artifact=draw9patch/build/libs/*.jar
+misc/screenshot2/build/screenshot2.pom --java-lib --usj-name=com.android.tools.screenshot2 --artifact=misc/screenshot2/build/libs/*.jar
diff --git a/debian/debian.gradle b/debian/debian.gradle
index e69de29..d93535c 100644
--- a/debian/debian.gradle
+++ b/debian/debian.gradle
@@ -0,0 +1,38 @@
+apply plugin: 'maven'
+
+/* No idea why adding any tasks with wahtever name would make Gradle complain
+ that this task exists. Therefore I have to set the "overwrite". */
+task generatePom(overwrite: true) {
+ outputs.files "${buildDir}/${project.name}.pom"
+ doFirst {
+ pom {
+ project {
+ if (hasProperty('pomName')) name pomName
+ if (hasProperty('pomDesc')) description pomDesc
+ url 'http://tools.android.com'
+ inceptionYear '2007'
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ }
+ }
+ scm {
+ url 'https://android.googlesource.com/platform/tools/base'
+ connection 'git://android.googlesource.com/platform/tools/base.git'
+ }
+ developers {
+ developer {
+ name 'The Android Open Source Project'
+ }
+ }
+ }
+ }.writeTo("${buildDir}/${project.name}.pom")
+ }
+}
+
+clean.doLast {
+ delete "${buildDir}/${project.name}.pom"
+}
+
+assemble.dependsOn generatePom
\ No newline at end of file
diff --git a/debian/libandroid-tools-annotations-java.poms b/debian/libandroid-tools-annotations-java.poms
index b4f469c..578cce5 100644
--- a/debian/libandroid-tools-annotations-java.poms
+++ b/debian/libandroid-tools-annotations-java.poms
@@ -1 +1 @@
-debian/poms/android-tools-annotations-pom.xml --java-lib --usj-name=com.android.tools.annotations --artifact=annotations/build/libs/*.jar
+annotations/build/annotations.pom --java-lib --usj-name=com.android.tools.annotations --artifact=annotations/build/libs/*.jar
diff --git a/debian/libandroid-tools-common-java.poms b/debian/libandroid-tools-common-java.poms
index a1993c2..bd13e13 100644
--- a/debian/libandroid-tools-common-java.poms
+++ b/debian/libandroid-tools-common-java.poms
@@ -1 +1 @@
-debian/poms/android-tools-common-pom.xml --java-lib --usj-name=com.android.tools.common --artifact=common/build/libs/*.jar
+common/build/common.pom --java-lib --usj-name=com.android.tools.common --artifact=common/build/libs/*.jar
diff --git a/debian/poms/android-tools-annotations-pom.xml b/debian/poms/android-tools-annotations-pom.xml
deleted file mode 100644
index a5b131a..0000000
--- a/debian/poms/android-tools-annotations-pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.android.tools</groupId>
- <artifactId>annotations</artifactId>
- <version>24.5.0</version>
- <description>annotations used throughout the Android tools libraries.</description>
- <url>http://tools.android.com/</url>
- <name>com.android.tools.annotations</name>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <name>The Android Open Source Project</name>
- </developer>
- </developers>
- <scm>
- <connection>git://android.googlesource.com/platform/tools/base.git</connection>
- <url>https://android.googlesource.com/platform/tools/base</url>
- </scm>
-</project>
\ No newline at end of file
diff --git a/debian/poms/android-tools-common-pom.xml b/debian/poms/android-tools-common-pom.xml
deleted file mode 100644
index e3e6b9e..0000000
--- a/debian/poms/android-tools-common-pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.android.tools</groupId>
- <artifactId>common</artifactId>
- <version>24.5.0</version>
- <dependencies>
- <dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>annotations</artifactId>
- <version>24.5.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>17.0</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <description>common library used by other Android tools libraries.</description>
- <url>http://tools.android.com/</url>
- <name>com.android.tools.common</name>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <name>The Android Open Source Project</name>
- </developer>
- </developers>
- <scm>
- <connection>git://android.googlesource.com/platform/tools/base.git</connection>
- <url>https://android.googlesource.com/platform/tools/base</url>
- </scm>
-</project>
\ No newline at end of file
diff --git a/debian/settings.gradle b/debian/settings.gradle
index e30f5e1..73e0215 100644
--- a/debian/settings.gradle
+++ b/debian/settings.gradle
@@ -6,7 +6,6 @@ project(':base').projectDir = rootDir
//include ':base:gradle-experimental'
//include ':base:jobb'
include ':base:annotations'
-include ':base:ant-tasks'
include ':base:archquery'
include ':base:asset-studio'
include ':base:builder-model'
@@ -42,7 +41,6 @@ include ':base:sdklib'
include ':base:testutils'
include ':base:transform-api'
-project(':base:ant-tasks' ).projectDir = new File(rootDir, 'legacy/ant-tasks')
project(':base:archquery' ).projectDir = new File(rootDir, 'legacy/archquery')
project(':base:builder-model' ).projectDir = new File(rootDir, 'build-system/builder-model')
project(':base:builder-test-api').projectDir = new File(rootDir, 'build-system/builder-test-api')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git
More information about the pkg-java-commits
mailing list