From 6b7cb0da2dc5097501301e4e0d39788724d63621 Mon Sep 17 00:00:00 2001 From: John Pendexter Date: Fri, 6 Feb 2015 13:43:39 -0500 Subject: [PATCH 1/2] Sub projects will generate jar files on build. See https://gist.github.com/kellyfj/9666950 --- assertj-android-appcompat-v7/build.gradle | 16 ++++++++++++++++ assertj-android-cardview-v7/build.gradle | 16 ++++++++++++++++ assertj-android-gridlayout-v7/build.gradle | 16 ++++++++++++++++ assertj-android-mediarouter-v7/build.gradle | 16 ++++++++++++++++ assertj-android-palette-v7/build.gradle | 16 ++++++++++++++++ assertj-android-play-services/build.gradle | 16 ++++++++++++++++ assertj-android-recyclerview-v7/build.gradle | 16 ++++++++++++++++ assertj-android-support-v4/build.gradle | 16 ++++++++++++++++ assertj-android/build.gradle | 16 ++++++++++++++++ 9 files changed, 144 insertions(+) diff --git a/assertj-android-appcompat-v7/build.gradle b/assertj-android-appcompat-v7/build.gradle index 80935af..1d103e1 100644 --- a/assertj-android-appcompat-v7/build.gradle +++ b/assertj-android-appcompat-v7/build.gradle @@ -21,6 +21,22 @@ android { lintOptions { abortOnError false } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android-cardview-v7/build.gradle b/assertj-android-cardview-v7/build.gradle index 204c9a8..785e5ae 100644 --- a/assertj-android-cardview-v7/build.gradle +++ b/assertj-android-cardview-v7/build.gradle @@ -21,6 +21,22 @@ android { lintOptions { abortOnError false } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android-gridlayout-v7/build.gradle b/assertj-android-gridlayout-v7/build.gradle index 43e7dab..5d924cf 100644 --- a/assertj-android-gridlayout-v7/build.gradle +++ b/assertj-android-gridlayout-v7/build.gradle @@ -21,6 +21,22 @@ android { lintOptions { abortOnError false } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android-mediarouter-v7/build.gradle b/assertj-android-mediarouter-v7/build.gradle index c8b6543..042a5b9 100644 --- a/assertj-android-mediarouter-v7/build.gradle +++ b/assertj-android-mediarouter-v7/build.gradle @@ -21,6 +21,22 @@ android { lintOptions { abortOnError false } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android-palette-v7/build.gradle b/assertj-android-palette-v7/build.gradle index 214eb0b..810ddf7 100644 --- a/assertj-android-palette-v7/build.gradle +++ b/assertj-android-palette-v7/build.gradle @@ -21,6 +21,22 @@ android { lintOptions { abortOnError false } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android-play-services/build.gradle b/assertj-android-play-services/build.gradle index 8057985..35f116f 100644 --- a/assertj-android-play-services/build.gradle +++ b/assertj-android-play-services/build.gradle @@ -22,6 +22,22 @@ android { abortOnError false disable 'InlinedApi', 'AllowBackup' } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android-recyclerview-v7/build.gradle b/assertj-android-recyclerview-v7/build.gradle index b9220a9..822a413 100644 --- a/assertj-android-recyclerview-v7/build.gradle +++ b/assertj-android-recyclerview-v7/build.gradle @@ -21,6 +21,22 @@ android { lintOptions { abortOnError false } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android-support-v4/build.gradle b/assertj-android-support-v4/build.gradle index 76628ad..34f8fd1 100644 --- a/assertj-android-support-v4/build.gradle +++ b/assertj-android-support-v4/build.gradle @@ -22,6 +22,22 @@ android { abortOnError false disable 'InlinedApi', 'AllowBackup' } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') diff --git a/assertj-android/build.gradle b/assertj-android/build.gradle index 94f6ef4..faf0148 100644 --- a/assertj-android/build.gradle +++ b/assertj-android/build.gradle @@ -22,6 +22,22 @@ android { abortOnError false disable 'InlinedApi', 'AllowBackup' } + + libraryVariants.all { variant -> + def name = variant.buildType.name + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + return; + } + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.from configurations.compile.findAll { + it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') + }.collect { + it.isDirectory() ? it : zipTree(it) + } + artifacts.add('archives', task); + } } apply from: rootProject.file('gradle/checkstyle.gradle') From 21f938403e80be1535f88b600993c4e801be2413 Mon Sep 17 00:00:00 2001 From: John Pendexter Date: Mon, 9 Feb 2015 08:15:53 -0500 Subject: [PATCH 2/2] Updating the gradle scripts based on suggestions in the pull request. --- assertj-android-appcompat-v7/build.gradle | 17 ++++++---------- assertj-android-cardview-v7/build.gradle | 17 ++++++---------- assertj-android-gridlayout-v7/build.gradle | 17 ++++++---------- assertj-android-mediarouter-v7/build.gradle | 17 ++++++---------- assertj-android-palette-v7/build.gradle | 17 ++++++---------- assertj-android-play-services/build.gradle | 17 ++++++---------- assertj-android-recyclerview-v7/build.gradle | 17 ++++++---------- assertj-android-support-v4/build.gradle | 17 ++++++---------- assertj-android/build.gradle | 21 ++++++++------------ 9 files changed, 56 insertions(+), 101 deletions(-) diff --git a/assertj-android-appcompat-v7/build.gradle b/assertj-android-appcompat-v7/build.gradle index 1d103e1..74d312b 100644 --- a/assertj-android-appcompat-v7/build.gradle +++ b/assertj-android-appcompat-v7/build.gradle @@ -24,18 +24,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android-cardview-v7/build.gradle b/assertj-android-cardview-v7/build.gradle index 785e5ae..628fa94 100644 --- a/assertj-android-cardview-v7/build.gradle +++ b/assertj-android-cardview-v7/build.gradle @@ -24,18 +24,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android-gridlayout-v7/build.gradle b/assertj-android-gridlayout-v7/build.gradle index 5d924cf..163b858 100644 --- a/assertj-android-gridlayout-v7/build.gradle +++ b/assertj-android-gridlayout-v7/build.gradle @@ -24,18 +24,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android-mediarouter-v7/build.gradle b/assertj-android-mediarouter-v7/build.gradle index 042a5b9..3688c60 100644 --- a/assertj-android-mediarouter-v7/build.gradle +++ b/assertj-android-mediarouter-v7/build.gradle @@ -24,18 +24,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android-palette-v7/build.gradle b/assertj-android-palette-v7/build.gradle index 810ddf7..2ba09bc 100644 --- a/assertj-android-palette-v7/build.gradle +++ b/assertj-android-palette-v7/build.gradle @@ -24,18 +24,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android-play-services/build.gradle b/assertj-android-play-services/build.gradle index 35f116f..6c9a3ef 100644 --- a/assertj-android-play-services/build.gradle +++ b/assertj-android-play-services/build.gradle @@ -25,18 +25,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android-recyclerview-v7/build.gradle b/assertj-android-recyclerview-v7/build.gradle index 822a413..491e9de 100644 --- a/assertj-android-recyclerview-v7/build.gradle +++ b/assertj-android-recyclerview-v7/build.gradle @@ -24,18 +24,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android-support-v4/build.gradle b/assertj-android-support-v4/build.gradle index 34f8fd1..eb72cbb 100644 --- a/assertj-android-support-v4/build.gradle +++ b/assertj-android-support-v4/build.gradle @@ -25,18 +25,13 @@ android { libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); } } diff --git a/assertj-android/build.gradle b/assertj-android/build.gradle index faf0148..2a5a33c 100644 --- a/assertj-android/build.gradle +++ b/assertj-android/build.gradle @@ -24,19 +24,14 @@ android { } libraryVariants.all { variant -> - def name = variant.buildType.name - if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { - return; - } - def task = project.tasks.create "jar${name.capitalize()}", Jar - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.from configurations.compile.findAll { - it.getName() != 'android.jar' && !it.getName().startsWith('junit') && !it.getName().startsWith('hamcrest') - }.collect { - it.isDirectory() ? it : zipTree(it) - } - artifacts.add('archives', task); + def name = variant.buildType.name + // Only attach a jar for non-debug builds + if (!name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { + def task = project.tasks.create "jar${name.capitalize()}", Jar + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + artifacts.add('archives', task); + } } }