[android-platform-tools-base] 17/30: Install Android Plugin for Gradle to new packages libgradle-android-plugin-java(-doc)
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 bb0e23f0b4a9cc9ca4b26771877824a951e58b36
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Thu Jul 21 21:24:36 2016 +0800
Install Android Plugin for Gradle to new packages libgradle-android-plugin-java(-doc)
---
debian/android-platform-tools-base.poms | 13 +++++-
debian/control | 39 +++++++++++++++++-
debian/libgradle-android-plugin-java-doc.install | 4 ++
debian/libgradle-android-plugin-java-doc.links | 1 +
debian/libgradle-android-plugin-java.poms | 11 +++++
debian/patches/build.gradle.patch | 51 ++++++++++++++++--------
debian/rules | 2 +-
7 files changed, 99 insertions(+), 22 deletions(-)
diff --git a/debian/android-platform-tools-base.poms b/debian/android-platform-tools-base.poms
index 7febf18..143b2c3 100644
--- a/debian/android-platform-tools-base.poms
+++ b/debian/android-platform-tools-base.poms
@@ -1,2 +1,11 @@
-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
+asset-studio/build/asset-studio.pom --java-lib --artifact=asset-studio/build/libs/*.jar --usj-name=com.android.tools.asset-studio
+ddmlib/build/ddmlib.pom --java-lib --artifact=ddmlib/build/libs/*.jar --usj-name=com.android.tools.ddms.ddmlib
+device_validator/dvlib/build/dvlib.pom --java-lib --artifact=device_validator/dvlib/build/libs/*.jar --usj-name=com.android.tools.dvlib
+draw9patch/build/draw9patch.pom --java-lib --artifact=draw9patch/build/libs/*.jar --usj-name=com.android.tools.draw9patch
+layoutlib-api/build/layoutlib-api.pom --java-lib --artifact=layoutlib-api/build/libs/*.jar --usj-name=com.android.tools.layoutlib.layoutlib-api
+legacy/archquery/build/archquery.pom --java-lib --artifact=legacy/archquery/build/libs/*.jar --usj-name=com.android.tools.archquery
+misc/screenshot2/build/screenshot2.pom --java-lib --artifact=misc/screenshot2/build/libs/*.jar --usj-name=com.android.tools.screenshot2
+repository/build/repository.pom --java-lib --artifact=repository/build/libs/*.jar --usj-name=com.android.tools.repository
+sdk-common/build/sdk-common.pom --java-lib --artifact=sdk-common/build/libs/*.jar --usj-name=com.android.tools.sdk-common
+sdklib/build/sdklib.pom --java-lib --artifact=sdklib/build/libs/*.jar --usj-name=com.android.tools.sdklib
+testutils/build/testutils.pom --java-lib --artifact=testutils/build/libs/*.jar --usj-name=com.android.tools.testutils
diff --git a/debian/control b/debian/control
index a31a722..09c86cd 100644
--- a/debian/control
+++ b/debian/control
@@ -54,8 +54,7 @@ Description: base tools for developing applications for the Android system
Studio and from the command line on your machine or on machines where
Android Studio is not installed (such as continuous integration servers).
.
- * Manifest Merger, ddmlib, layoutlib, chartlib, Jack & Jill (Java Android
- Compiler Kit).
+ * Various Java libraries used by Android SDK.
Package: libandroid-tools-annotations-java
Architecture: all
@@ -72,3 +71,39 @@ Depends:
Description: common library used by other Android tools libraries
This package provides common tasks and classes which are used by other Android
tools libraries.
+
+Package: libgradle-android-plugin-java
+Architecture: all
+Depends: android-platform-tools-base,
+ ${misc:Depends}
+Breaks: android-platform-tools-base (<< 2.0.0-1)
+Replaces: android-platform-tools-base (<< 2.0.0-1)
+Suggest: gradle
+Description: Android Plugin for Gradle
+ The Android build system uses the Android Plugin for Gradle to support building
+ Android applications with the Gradle build toolkit. The plugin runs independent
+ of Android Studio so the plugin and the Gradle build system can be updated
+ independently of Android Studio. You can build your Android applications from
+ within Android Studio or from the command line on your machine or on machines
+ where Android Studio is not installed (such as continuous integration servers).
+ .
+ This package does not include gradle-experimental.jar because its dependencies
+ are hard to resolve in Debian.
+ .
+ To build an Android application using the plugin in Debian, add a Maven
+ repository with a URL "file:///usr/share/maven-repo", and change the plugin
+ classpath to "com.android.tools.build:gradle:debian".
+
+Package: libgradle-android-plugin-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Android Plugin for Gradle - Documentations
+ The Android build system uses the Android Plugin for Gradle to support building
+ Android applications with the Gradle build toolkit. The plugin runs independent
+ of Android Studio so the plugin and the Gradle build system can be updated
+ independently of Android Studio. You can build your Android applications from
+ within Android Studio or from the command line on your machine or on machines
+ where Android Studio is not installed (such as continuous integration servers).
+ .
+ This package provides some templates for using the Gradle plugin.
\ No newline at end of file
diff --git a/debian/libgradle-android-plugin-java-doc.install b/debian/libgradle-android-plugin-java-doc.install
new file mode 100644
index 0000000..d0cbcb1
--- /dev/null
+++ b/debian/libgradle-android-plugin-java-doc.install
@@ -0,0 +1,4 @@
+templates/activities usr/share/doc/libgradle-android-plugin-java/templates
+templates/gradle usr/share/doc/libgradle-android-plugin-java/templates
+templates/gradle-projects usr/share/doc/libgradle-android-plugin-java/templates
+templates/other usr/share/doc/libgradle-android-plugin-java/templates
\ No newline at end of file
diff --git a/debian/libgradle-android-plugin-java-doc.links b/debian/libgradle-android-plugin-java-doc.links
new file mode 100644
index 0000000..8d3fc4e
--- /dev/null
+++ b/debian/libgradle-android-plugin-java-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libgradle-android-plugin-java/templates usr/lib/android-sdk/tools/templates
\ No newline at end of file
diff --git a/debian/libgradle-android-plugin-java.poms b/debian/libgradle-android-plugin-java.poms
new file mode 100644
index 0000000..f289526
--- /dev/null
+++ b/debian/libgradle-android-plugin-java.poms
@@ -0,0 +1,11 @@
+build-system/builder-model/build/builder-model.pom --java-lib --artifact=build-system/builder-model/build/libs/*.jar --usj-name=com.android.tools.build.builder-model
+build-system/builder-test-api/build/builder-test-api.pom --java-lib --artifact=build-system/builder-test-api/build/libs/*.jar --usj-name=com.android.tools.build.builder-test-api
+build-system/builder/build/builder.pom --java-lib --artifact=build-system/builder/build/libs/*.jar --usj-name=com.android.tools.build.builder
+build-system/google-services/build/google-services.pom --java-lib --artifact=build-system/google-services/build/libs/*.jar --usj-name=com.google.gms.google-services
+build-system/gradle-api/build/gradle-api.pom --java-lib --artifact=build-system/gradle-api/build/libs/*.jar --usj-name=com.android.tools.build.gradle-api
+build-system/gradle-core/build/gradle-core.pom --java-lib --artifact=build-system/gradle-core/build/libs/*.jar --usj-name=com.android.tools.build.gradle-core
+build-system/gradle/build/gradle.pom --java-lib --artifact=build-system/gradle/build/libs/*.jar --usj-name=com.android.tools.build.gradle
+build-system/manifest-merger/build/manifest-merger.pom --java-lib --artifact=build-system/manifest-merger/build/libs/*.jar --usj-name=com.android.tools.build.manifest-merger
+build-system/transform-api/build/transform-api.pom --java-lib --artifact=build-system/transform-api/build/libs/*.jar --usj-name=com.android.tools.build.transform-api
+jack/jack-api/build/jack-api.pom --java-lib --artifact=jack/jack-api/build/libs/*.jar --usj-name=com.android.tools.jack.jack-api
+jack/jill-api/build/jill-api.pom --java-lib --artifact=jack/jill-api/build/libs/*.jar --usj-name=com.android.tools.jill.jill-api
diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
index 5a51e6d..d0995ee 100644
--- a/debian/patches/build.gradle.patch
+++ b/debian/patches/build.gradle.patch
@@ -83,14 +83,13 @@ Description: Patch upstream's build system for Debian.
-
--- a/build-system/builder/build.gradle
+++ b/build-system/builder/build.gradle
-@@ -1,6 +1,4 @@
+@@ -1,5 +1,4 @@
apply plugin: 'java'
-apply plugin: 'clone-artifacts'
--apply plugin: 'jacoco'
+ apply plugin: 'jacoco'
evaluationDependsOn(':base:builder-model')
- evaluationDependsOn(':base:builder-test-api')
-@@ -28,7 +26,7 @@
+@@ -28,7 +27,7 @@
testCompile 'org.mockito:mockito-all:1.9.5'
testCompile 'com.google.truth:truth:0.28'
testCompile project(':base:testutils')
@@ -99,7 +98,7 @@ Description: Patch upstream's build system for Debian.
}
test {
-@@ -42,9 +40,6 @@
+@@ -42,9 +41,6 @@
project.ext.pomName = 'Android Builder library'
project.ext.pomDesc = 'Library to build Android applications.'
@@ -109,31 +108,49 @@ Description: Patch upstream's build system for Debian.
jar.manifest.attributes("Builder-Version": version)
-@@ -98,11 +93,7 @@
+@@ -54,6 +50,7 @@
+ main {
+ java {
+ srcDir generated
++ srcDir '../profile/src/main/java'
+ }
+ }
+ }
+@@ -86,23 +83,6 @@
+ sourcesProvided
+ }
+
+-dependencies {
+- provided(project(':base:profile')) {
+- transitive = false
+- }
+- sourcesProvided(project(path:':base:profile', configuration:'sourcesOnly')) {
+- transitive = false
+- }
+-}
+-
sourceSets.main.compileClasspath += [configurations.provided]
sourceSets.test.runtimeClasspath += [configurations.provided]
- tasks.compileJava.dependsOn(configurations.provided)
+-tasks.compileJava.dependsOn(configurations.provided)
-tasks.sourcesJar.dependsOn(configurations.sourcesProvided)
-
- tasks.jar {
- from({zipTree(configurations.provided.singleFile)})
+-
+-tasks.jar {
+- from({zipTree(configurations.provided.singleFile)})
-}
-tasks.sourcesJar {
- from({zipTree(configurations.sourcesProvided.singleFile)})
-}
-+}
++tasks.compileJava.dependsOn(configurations.provided)
\ No newline at end of file
--- a/build-system/google-services/build.gradle
+++ b/build-system/google-services/build.gradle
-@@ -1,7 +1,4 @@
+@@ -1,5 +1,4 @@
apply plugin: 'groovy'
-apply plugin: 'clone-artifacts'
--apply plugin: 'idea'
--apply plugin: 'jacoco'
+ apply plugin: 'idea'
+ apply plugin: 'jacoco'
- dependencies {
- compile gradleApi()
-@@ -21,8 +18,6 @@
+@@ -21,8 +20,6 @@
project.ext.pomName = 'Gradle Plug-in for Google Services'
project.ext.pomDesc = 'Gradle plug-in for Google Services'
diff --git a/debian/rules b/debian/rules
index c0071b8..dce8cb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
dh $@ --parallel --with maven_repo_helper --buildsystem=gradle
override_dh_auto_build:
- dh_auto_build -- -x test --project-prop release=true --settings-file debian/settings.gradle assemble
+ dh_auto_build -- -x test --settings-file debian/settings.gradle assemble
get-orig-source: gradle_$(DEB_VERSION_UPSTREAM).tar.gz
mk-origtargz --repack --compression xz $<
--
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