Skip to content
This repository was archived by the owner on Jun 11, 2020. It is now read-only.

Commit f738017

Browse files
committed
Fixes issue of "noTag()" not working
1 parent a87afdc commit f738017

6 files changed

Lines changed: 32 additions & 10 deletions

File tree

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,11 @@ jobs:
3737
- stage: release
3838
os: linux
3939
jdk: openjdk8
40-
install: ./gradlew assemble -Penv=prod -Prelease
4140
before_script:
4241
- git config --local user.name "Travis CI Deployment Bot"
4342
- git config --local user.email "deploy@travis-ci.org"
4443
- ./gradlew tag -Prelease
45-
- export GRADLE_PROJECT_RELEASE_NAME=$(./gradlew getReleaseName --quiet)
46-
- export GRADLE_PROJECT_RELEASE_NOTES=$(./gradlew getReleaseNotes --quiet)
47-
script: ./gradlew deploy -Penv=prod -Prelease
44+
script: ./gradlew assemble deploy -Penv=prod -Prelease
4845
after_success:
4946
- bash <(curl -s https://codecov.io/bash)
5047

Clog/src/main/java/com/caseyjbrooks/clog/Clog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static ClogProfile tag(String tag) {
9999
}
100100

101101
public static ClogProfile noTag() {
102-
return getInstance().tag(null);
102+
return getInstance().tag("");
103103
}
104104

105105
// Generic key-valued logging calls
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
version: '2.0.6'
3+
---
4+
5+
- Fixes issue of `noTag()` not working

Clog/src/test/java/com/caseyjbrooks/clog/ClogTest.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,28 @@ public void testPriorities() {
282282

283283
Clog.getInstance().popTag();
284284
}
285+
286+
@Test
287+
public void testMessageWithDefaultTag() {
288+
Clog.log("Test using default tag");
289+
assertEquals("ClogTest", Clog.getInstance().getLastTag());
290+
assertEquals("Test using default tag", Clog.getInstance().getLastLog());
291+
Clog.getInstance().flush();
292+
}
293+
294+
@Test
295+
public void testMessageWithManualTag() {
296+
Clog.tag("Custom Tag").log("Test using manual tag");
297+
assertEquals("Custom Tag", Clog.getInstance().getLastTag());
298+
assertEquals("Test using manual tag", Clog.getInstance().getLastLog());
299+
Clog.getInstance().flush();
300+
}
301+
302+
@Test
303+
public void testMessageWithNoTag() {
304+
Clog.noTag().log("Test using no tag");
305+
assertEquals("", Clog.getInstance().getLastTag());
306+
assertEquals("Test using no tag", Clog.getInstance().getLastLog());
307+
Clog.getInstance().flush();
308+
}
285309
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//----------------------------------------------------------------------------------------------------------------------
33

44
buildscript {
5-
ext.orchid_version = '0.15.0'
5+
ext.orchid_version = '0.15.1'
66
repositories {
77
google()
88
jcenter()

semantic-build-versioning.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
tagPrefix = 'v'
21
autobump {
32
majorPattern = ~/^\[major\]/
43
minorPattern = ~/^\[minor\]/
5-
patchPattern = ~/^\[patch\]/
6-
newPreReleasePattern = ~/^\[pre-release\]/
7-
promoteToReleasePattern = ~/^\[release\]/
84
}

0 commit comments

Comments
 (0)