From 79e59028acd2adb7d6002790f8054dd17a481fad Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 12 Mar 2015 13:22:11 +0100 Subject: [PATCH 1/4] Bump gradle-clirr-plugin to 0.2.0 --- build.gradle | 7 +++---- version.gradle | 5 ----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index a5ad8a99c..a229f0e04 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'org.kordamp:markdown-gradle-plugin:1.0.0' - classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.1.0' + classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.0' } } apply plugin: 'org.kordamp.gradle.markdown' @@ -283,8 +283,7 @@ subprojects { } clirr { - baseline = [group, name, clirrBaseline].join(':') - failOnErrors clirrFailOnErrors + semver false } } @@ -297,7 +296,7 @@ subprojects*.jar { // Important to specify this task after the subprojects block task clirrRootReport(type: org.kordamp.gradle.clirr.ClirrReportTask) { dependsOn = subprojects.tasks.clirr - reports = files(subprojects.tasks.clirr.xmlReport) + reports = files((subprojects.findAll { it.clirr.enabled == true }).tasks.clirr.xmlReport) } def getGitCommit() { diff --git a/version.gradle b/version.gradle index 0c944602b..f9f03001b 100644 --- a/version.gradle +++ b/version.gradle @@ -4,10 +4,5 @@ allprojects { isSnapshot = true jxmppVersion = '0.4.2-beta1' smackMinAndroidSdk = 8 - - // The baseline version to check the API's binary - // compatibility against with Clirr. - clirrBaseline = '4.1.0-rc2' - clirrFailOnErrors = false } } From 38281026511d2c520382ae94608b40bb1bb93d84 Mon Sep 17 00:00:00 2001 From: Anno van Vliet Date: Mon, 9 Mar 2015 11:19:47 +0100 Subject: [PATCH 2/4] Move EnhancedDebugger's images to the correct location --- .../src/main/resources/{ => images}/message.png | Bin .../main/resources/{ => images}/nav_left_blue.png | Bin .../main/resources/{ => images}/nav_right_red.png | Bin .../main/resources/{ => images}/photo_portrait.png | Bin .../resources/{ => images}/question_and_answer.png | Bin .../resources/{ => images}/trafficlight_green.png | Bin .../resources/{ => images}/trafficlight_off.png | Bin .../resources/{ => images}/trafficlight_red.png | Bin .../src/main/resources/{ => images}/unknown.png | Bin .../src/main/resources/{ => images}/warning.png | Bin 10 files changed, 0 insertions(+), 0 deletions(-) rename smack-debug/src/main/resources/{ => images}/message.png (100%) rename smack-debug/src/main/resources/{ => images}/nav_left_blue.png (100%) rename smack-debug/src/main/resources/{ => images}/nav_right_red.png (100%) rename smack-debug/src/main/resources/{ => images}/photo_portrait.png (100%) rename smack-debug/src/main/resources/{ => images}/question_and_answer.png (100%) rename smack-debug/src/main/resources/{ => images}/trafficlight_green.png (100%) rename smack-debug/src/main/resources/{ => images}/trafficlight_off.png (100%) rename smack-debug/src/main/resources/{ => images}/trafficlight_red.png (100%) rename smack-debug/src/main/resources/{ => images}/unknown.png (100%) rename smack-debug/src/main/resources/{ => images}/warning.png (100%) diff --git a/smack-debug/src/main/resources/message.png b/smack-debug/src/main/resources/images/message.png similarity index 100% rename from smack-debug/src/main/resources/message.png rename to smack-debug/src/main/resources/images/message.png diff --git a/smack-debug/src/main/resources/nav_left_blue.png b/smack-debug/src/main/resources/images/nav_left_blue.png similarity index 100% rename from smack-debug/src/main/resources/nav_left_blue.png rename to smack-debug/src/main/resources/images/nav_left_blue.png diff --git a/smack-debug/src/main/resources/nav_right_red.png b/smack-debug/src/main/resources/images/nav_right_red.png similarity index 100% rename from smack-debug/src/main/resources/nav_right_red.png rename to smack-debug/src/main/resources/images/nav_right_red.png diff --git a/smack-debug/src/main/resources/photo_portrait.png b/smack-debug/src/main/resources/images/photo_portrait.png similarity index 100% rename from smack-debug/src/main/resources/photo_portrait.png rename to smack-debug/src/main/resources/images/photo_portrait.png diff --git a/smack-debug/src/main/resources/question_and_answer.png b/smack-debug/src/main/resources/images/question_and_answer.png similarity index 100% rename from smack-debug/src/main/resources/question_and_answer.png rename to smack-debug/src/main/resources/images/question_and_answer.png diff --git a/smack-debug/src/main/resources/trafficlight_green.png b/smack-debug/src/main/resources/images/trafficlight_green.png similarity index 100% rename from smack-debug/src/main/resources/trafficlight_green.png rename to smack-debug/src/main/resources/images/trafficlight_green.png diff --git a/smack-debug/src/main/resources/trafficlight_off.png b/smack-debug/src/main/resources/images/trafficlight_off.png similarity index 100% rename from smack-debug/src/main/resources/trafficlight_off.png rename to smack-debug/src/main/resources/images/trafficlight_off.png diff --git a/smack-debug/src/main/resources/trafficlight_red.png b/smack-debug/src/main/resources/images/trafficlight_red.png similarity index 100% rename from smack-debug/src/main/resources/trafficlight_red.png rename to smack-debug/src/main/resources/images/trafficlight_red.png diff --git a/smack-debug/src/main/resources/unknown.png b/smack-debug/src/main/resources/images/unknown.png similarity index 100% rename from smack-debug/src/main/resources/unknown.png rename to smack-debug/src/main/resources/images/unknown.png diff --git a/smack-debug/src/main/resources/warning.png b/smack-debug/src/main/resources/images/warning.png similarity index 100% rename from smack-debug/src/main/resources/warning.png rename to smack-debug/src/main/resources/images/warning.png From fe102d780e9fe824a74cd5e494526cf49d5dad8f Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 18 Mar 2015 08:23:40 +0100 Subject: [PATCH 3/4] Smack 4.1.0-rc4 --- version.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle b/version.gradle index f9f03001b..02dade864 100644 --- a/version.gradle +++ b/version.gradle @@ -1,7 +1,7 @@ allprojects { ext { shortVersion = '4.1.0-rc4' - isSnapshot = true + isSnapshot = false jxmppVersion = '0.4.2-beta1' smackMinAndroidSdk = 8 } From 8c0218f560ed4d79c04e081594299a1564842ba9 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 18 Mar 2015 08:33:10 +0100 Subject: [PATCH 4/4] Smack 4.1.0-rc5-SNAPSHOT --- version.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.gradle b/version.gradle index 02dade864..b93c2e4df 100644 --- a/version.gradle +++ b/version.gradle @@ -1,7 +1,7 @@ allprojects { ext { - shortVersion = '4.1.0-rc4' - isSnapshot = false + shortVersion = '4.1.0-rc5' + isSnapshot = true jxmppVersion = '0.4.2-beta1' smackMinAndroidSdk = 8 }