Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Clashsoft committed Feb 21, 2020
2 parents db8cc58 + 8488e68 commit b113006
Show file tree
Hide file tree
Showing 27 changed files with 2,713 additions and 1,772 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 3
indent_style = space
insert_final_newline = true
max_line_length = 120
tab_width = 3
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ jdk:
- openjdk8
- openjdk11

git:
depth: false

# --------------- Gradle Cache ---------------

before_cache:
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,30 @@
# fulibYaml v1.1.0

* Bumped version number.

# fulibYaml v1.2.0

## New Features

+ Added the `ReflectorMap.canReflect` and `.discoverObjects` methods.
+ Added the `Reflector.getOwnProperties` and `.getAllProperties` methods.
+ Added the `YamlGenerator` class, a more streamlined API for converting events to YAML.
+ Added the `IdMap` class.

## Bugfixes

* Fixed an exception when `YamlIdMap` discovers objects of unknown types. #15

## Improvements

* `YamlIdMap` no longer appends auto-incremented numbers to IDs if not necessary. #16

## General

* Transitioned many APIs from concrete implementation types like `ArrayList` or `LinkedHashMap` to their respective
interfaces like `List` or `Map`.
> In places where this could not be done in-place, new APIs were added and the old ones deprecated.
> See the respective Javadocs for migration info.
* Deprecated some misplaced or accidentally public APIs.
> Check for deprecation warnings and see the respective Javadocs for migration info.
* General code cleanup and minor optimizations.
79 changes: 42 additions & 37 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,66 +1,71 @@
plugins {
id 'java'
id 'maven-publish'
id 'com.jfrog.bintray' version '1.8.4'
id 'de.clashsoft.simple-publish' version '0.5.0'
// id 'org.fulib.fulibGradle' version '0.1.0'
id 'java'
id 'maven-publish'
id 'com.jfrog.bintray' version '1.8.4'
id 'de.clashsoft.simple-publish' version '0.5.0'
id 'com.palantir.revapi' version '1.1.2'
// id 'org.fulib.fulibGradle' version '0.1.0'
}

group = 'org.fulib'
version = 'git describe --tags'.execute().text[1..-2] // strip v and \n
description = 'Yaml serialization for fulib object models. Used for storage and communication.'

publishInfo {
organization = 'fujaba'
githubRepo = 'fujaba/fulibYaml'
labels = [ 'fulib', 'yaml' ]
organization = 'fujaba'
githubRepo = 'fujaba/fulibYaml'
labels = [ 'fulib', 'yaml' ]

developer {
id = 'zuendorf'
name = 'Albert Zuendorf'
}
developer {
id = 'digitalhoax'
name = 'Tobias George'
}
developer {
id = 'eicke123'
name = 'Christoph Eickhoff'
}
developer {
id = 'zuendorf'
name = 'Albert Zuendorf'
}
developer {
id = 'digitalhoax'
name = 'Tobias George'
}
developer {
id = 'eicke123'
name = 'Christoph Eickhoff'
}
developer {
id = 'clashsoft'
name = 'Adrian Kunz'
}

license {
name = 'MIT License'
url = 'http://www.opensource.org/licenses/mit-license.php'
}
license {
name = 'MIT License'
url = 'http://www.opensource.org/licenses/mit-license.php'
}
}

sourceCompatibility = 1.8

// --------------- Dependencies ---------------

repositories {
mavenLocal()
mavenCentral()
jcenter()
mavenLocal()
mavenCentral()
jcenter()
}

dependencies {
// https://mvnrepository.com/artifact/org.hamcrest/hamcrest-library
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
// https://mvnrepository.com/artifact/org.hamcrest/hamcrest-library
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'

// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.3.2'
// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.3.2'

// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.3.2'
// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.3.2'
}

// --------------- Misc. Settings ---------------

javadoc {
failOnError = false
test {
useJUnitPlatform()
}

test {
useJUnitPlatform()
revapi {
oldVersion = '1.1.0'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 12 additions & 17 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
i=`expr $i + 1`
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

Expand All @@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
3 changes: 3 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

Expand Down
Loading

0 comments on commit b113006

Please sign in to comment.