Skip to content

Commit

Permalink
Merge branch 'release/1.2.x'
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGELOG.md
	README.md
	pom.xml
	src/main/java/de/alpharogroup/throwable/ThrowableExtensions.java
	src/test/java/de/alpharogroup/throwable/ThrowableExtensionsTest.java
  • Loading branch information
astrapi69 committed Jan 17, 2020
2 parents e7625a9 + 3bf2637 commit 4af1229
Show file tree
Hide file tree
Showing 28 changed files with 793 additions and 145 deletions.
40 changes: 31 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

##################
# Compiled files #
##################
Expand All @@ -6,11 +15,18 @@
##################
# intellij files #
##################
*.iws
*.iml
*.iws
*.ipr
!.idea/runConfigurations
.idea/inspectionProfiles
.idea/copyright
.idea/libraries
.idea/codeStyles
.idea/shelf
.idea/*.*
/.idea/$PRODUCT_WORKSPACE_FILE$

#################
# eclipse files #
Expand All @@ -29,18 +45,13 @@
# Zip files #
#############
*.tar
*.tar.gz
*.zip
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.war
*.nar
*.ear
*.rar

##############
# Logs files #
Expand All @@ -63,9 +74,20 @@
/build
/.gradle
/gradle
/pom.xml.bak
/out
# Ignore Gradle GUI config
gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!/gradle/wrapper/gradle-wrapper.jar
!/gradle/wrapper/gradle-wrapper.properties
# Cache of project
.gradletasknamecache
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties

##########################################################################################
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml #
##########################################################################################
##############################################################
# virtual machine crash logs #
# see http://www.java.com/en/download/help/error_hotspot.xml #
##############################################################
hs_err_pid*
/.attach_pid*
21 changes: 21 additions & 0 deletions .idea/runConfigurations/throw_able__build_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/runConfigurations/throw_able__dependencyUpdates_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/runConfigurations/throw_able__jacocoTestReport_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/runConfigurations/throw_able__javadoc_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/runConfigurations/throw_able__licenseFormat_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/runConfigurations/throw_able__publish_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
## Change log
----------------------

Version 1.2
-------------

ADDED:

- new consumer functional interface that provide a method that can handle checked exceptions
- new method that creates a consumer that can handle checked exceptions

CHANGED:

- migrate to gradle build system
- removed all maven related files

Version 1.1
-------------

ADDED:

- added new factory method for create a custom message from a given Throwable with additional infos
- new factory method for create a custom message from a given Throwable with additional infos

CHANGED:

Expand Down
20 changes: 18 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Than you can add the dependency to your dependencies:
<properties>
...
<!-- THROW-ABLE version -->
<throw-able.version>1.1</throw-able.version>
<throw-able.version>1.2</throw-able.version>
...
</properties>
...
Expand All @@ -41,6 +41,23 @@ Than you can add the dependency to your dependencies:
...
</dependencies>

## gradle dependency

You can first define the version in the ext section and add than the following gradle dependency to your project `build.gradle` if you want to import the core functionality of throw-able:

```
ext {
...
throwAbleVersion = "1.2"
...
}
dependencies {
...
compile "de.alpharogroup:throw-able:${throwAbleVersion}"
...
}
```

## Want to Help and improve it? ###

Expand Down Expand Up @@ -100,4 +117,3 @@ Open Source:
|Many thanks to [coveralls.io](https://coveralls.io) for providing a free code coverage for open source projects.|
|![Javadocs](http://www.javadoc.io/badge/de.alpharogroup/throw-able.svg)|
|Many thanks to [javadoc.io](http://www.javadoc.io) for providing a free javadoc documentation for open source projects.|

Loading

0 comments on commit 4af1229

Please sign in to comment.