Skip to content

Commit

Permalink
Merge pull request #43 from GoodforGod/dev
Browse files Browse the repository at this point in the history
[1.4.0]
  • Loading branch information
GoodforGod authored Aug 26, 2022
2 parents 0245a9c + de8f1ba commit 610ea92
Show file tree
Hide file tree
Showing 22 changed files with 473 additions and 303 deletions.
37 changes: 37 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# all-encompassing default settings unless otherwise specified
[*]
end_of_line = lf
charset = utf-8

# Json
[*.json]
indent_size = 2
indent_style = space
insert_final_newline = false
trim_trailing_whitespace = true

# Yaml
[{*.yml, *.yaml}]
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

# Property files
[*.properties]
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

# XML files
[*.xml]
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
20 changes: 16 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
.idea
*.iml
out
# Package Files #
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

### Gradle template
.gradle
target
build/
target/

# Idea generated files
.idea
.settings/
*.iml
out/
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ for mapping Java Classes to formats like [JSON](#json)/[AVRO](#avro-schema)/[Gra
- [Avro Schema](#avro-schema)
- [GraphQL](#graphql)
- [Limitations](#limitations)
- [Version History](#version-history)

## Installation

Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ plugins {
id "java-library"
id "maven-publish"

id "org.jetbrains.intellij" version "1.3.0"
id "org.jetbrains.intellij" version "1.8.1"
id "org.sonarqube" version "3.3"
id "com.diffplug.spotless" version "5.14.3"
id "com.diffplug.spotless" version "6.1.0"
}

repositories {
Expand All @@ -21,7 +21,7 @@ targetCompatibility = JavaVersion.VERSION_1_8

intellij {
plugins = ["java"]
version = "2021.3"
version = "2022.2"
downloadSources = false
}

Expand All @@ -38,7 +38,7 @@ spotless {
encoding("UTF-8")
importOrder()
removeUnusedImports()
eclipse().configFile("${projectDir}/config/codestyle.xml")
eclipse("4.21.0").configFile("${rootDir}/config/codestyle.xml")
}
}

Expand Down Expand Up @@ -66,11 +66,11 @@ configurations {
}

dependencies {
implementation "com.github.goodforgod:dummymaker:3.1.0"
implementation "org.javassist:javassist:3.28.0-GA"
implementation "com.github.goodforgod:dummymaker:3.2.0"
implementation "org.javassist:javassist:3.29.0-GA"

implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-avro:$jacksonVersion"
implementation "com.github.victools:jsonschema-generator:4.21.0"
implementation "com.github.victools:jsonschema-generator:4.25.0"
implementation "org.apache.avro:avro-compiler:1.9.2"
implementation "io.leangen.graphql:spqr:0.11.2"
}
Expand Down
370 changes: 206 additions & 164 deletions config/codestyle.xml

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
groupId=com.github.goodforgod
artifactId=dummymapper
artifactVersion=1.3.0
artifactVersion=1.4.0


##### GRADLE #####
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.caching=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8
org.gradle.jvmargs=-Dfile.encoding=UTF-8 \
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
--add-exports java.base/jdk.internal.vm=ALL-UNNAMED


##### FRAMEWORKS #####
jacksonVersion=2.12.0
jacksonVersion=2.12.0
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-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 610ea92

Please sign in to comment.