-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #32 from GoodforGod/dev
[3.1.0]
- Loading branch information
Showing
272 changed files
with
1,283 additions
and
1,064 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,17 @@ | ||
| .idea | ||
| *.iml | ||
| out | ||
| # Package Files # | ||
| *.war | ||
| *.nar | ||
| *.ear | ||
| *.zip | ||
| *.tar.gz | ||
| *.rar | ||
|
|
||
| ### Gradle template | ||
| .gradle | ||
| target | ||
| build/ | ||
|
|
||
| # Idea generatted files | ||
| .idea | ||
| /out/ | ||
| *.iml | ||
| .settings/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,61 @@ | ||
| plugins { | ||
| id 'jacoco' | ||
| id 'java-library' | ||
| id 'maven-publish' | ||
| id "jacoco" | ||
| id "maven-publish" | ||
| id "java-library" | ||
|
|
||
| id 'org.sonarqube' version '3.0' | ||
| id 'com.diffplug.gradle.spotless' version '4.4.0' | ||
| id "org.sonarqube" version "3.3" | ||
| id "com.diffplug.spotless" version "5.14.3" | ||
| } | ||
|
|
||
| group = groupId | ||
| version = artifactVersion | ||
|
|
||
| sourceCompatibility = 1.8 | ||
| targetCompatibility = 1.8 | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
|
|
||
| spotless { | ||
| java { | ||
| encoding 'UTF-8' | ||
| encoding("UTF-8") | ||
| importOrder() | ||
| removeUnusedImports() | ||
| eclipse().configFile "${projectDir}/config/codestyle.xml" | ||
| eclipse().configFile("${projectDir}/config/codestyle.xml") | ||
| } | ||
| } | ||
|
|
||
| sonarqube { | ||
| properties { | ||
| property 'sonar.host.url', 'https://sonarcloud.io' | ||
| property 'sonar.organization', 'goodforgod' | ||
| property 'sonar.projectKey', 'GoodforGod_dummymaker' | ||
| property "sonar.host.url", "https://sonarcloud.io" | ||
| property "sonar.organization", "goodforgod" | ||
| property "sonar.projectKey", "GoodforGod_dummymaker" | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| mavenCentral() | ||
| jcenter() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation 'org.jetbrains:annotations:20.1.0' | ||
| implementation 'org.slf4j:slf4j-api:1.7.30' | ||
| implementation 'me.xdrop:fuzzywuzzy:1.3.1' | ||
| implementation 'javax.inject:javax.inject:1' | ||
| implementation "org.jetbrains:annotations:22.0.0" | ||
| implementation "org.slf4j:slf4j-api:1.7.32" | ||
| implementation "javax.inject:javax.inject:1" | ||
|
|
||
| testRuntimeOnly 'ch.qos.logback:logback-classic:1.2.3' | ||
| testImplementation 'junit:junit:4.13' | ||
| testRuntimeOnly "ch.qos.logback:logback-classic:1.2.7" | ||
| testImplementation "junit:junit:4.13.2" | ||
| } | ||
|
|
||
| test { | ||
| useJUnit() | ||
| testLogging { | ||
| events 'passed', 'skipped', 'failed' | ||
| exceptionFormat 'full' | ||
| showStandardStreams = false | ||
| events("passed", "skipped", "failed") | ||
| exceptionFormat("full") | ||
| showStandardStreams(false) | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(JavaCompile) { | ||
| options.encoding = 'UTF-8' | ||
| options.incremental = true | ||
| options.fork = true | ||
| } | ||
|
|
||
| tasks.withType(Test) { | ||
| reports.html.enabled = false | ||
| reports.junitXml.enabled = false | ||
| } | ||
|
|
||
| java { | ||
| withJavadocJar() | ||
| withSourcesJar() | ||
| reports { | ||
| html.enabled(false) | ||
| junitXml.enabled(false) | ||
| } | ||
| } | ||
|
|
||
| publishing { | ||
|
|
@@ -76,27 +64,27 @@ publishing { | |
| from components.java | ||
|
|
||
| pom { | ||
| name = 'DummyMaker' | ||
| url = 'https://github.com/GoodforGod/dummymaker' | ||
| description = 'Library can fill Java Classes with random data and also export data in CSV/JSON/XML/SQL formats' | ||
| name = "DummyMaker" | ||
| url = "https://github.com/GoodforGod/dummymaker" | ||
| description = "Library can fill Java Classes with random data and also export data in CSV/JSON/XML/SQL formats" | ||
|
|
||
| license { | ||
| name = 'MIT License' | ||
| url = 'https://github.com/GoodforGod/dummymaker/blob/master/LICENSE' | ||
| distribution = 'repo' | ||
| name = "MIT License" | ||
| url = "https://github.com/GoodforGod/dummymaker/blob/master/LICENSE" | ||
| distribution = "repo" | ||
| } | ||
|
|
||
| developer { | ||
| id = 'GoodforGod' | ||
| name = 'Anton Kurako' | ||
| email = '[email protected]' | ||
| url = 'https://github.com/GoodforGod' | ||
| id = "GoodforGod" | ||
| name = "Anton Kurako" | ||
| email = "[email protected]" | ||
| url = "https://github.com/GoodforGod" | ||
| } | ||
|
|
||
| scm { | ||
| connection = 'scm:git:git://github.com/GoodforGod/dummymaker.git' | ||
| developerConnection = 'scm:git:ssh://GoodforGod/dummymaker.git' | ||
| url = 'https://github.com/GoodforGod/dummymaker/tree/master' | ||
| connection = "scm:git:git://github.com/GoodforGod/dummymaker.git" | ||
| developerConnection = "scm:git:ssh://GoodforGod/dummymaker.git" | ||
| url = "https://github.com/GoodforGod/dummymaker/tree/master" | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -106,7 +94,7 @@ publishing { | |
| maven { | ||
| def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" | ||
| def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" | ||
| url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl | ||
| url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl | ||
| credentials { | ||
| username System.getenv("OSS_USERNAME") | ||
| password System.getenv("OSS_PASSWORD") | ||
|
|
@@ -115,6 +103,17 @@ publishing { | |
| } | ||
| } | ||
|
|
||
| java { | ||
| withJavadocJar() | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| tasks.withType(JavaCompile) { | ||
| options.encoding("UTF-8") | ||
| options.incremental(true) | ||
| options.fork = true | ||
| } | ||
|
|
||
| check.dependsOn jacocoTestReport | ||
| jacocoTestReport { | ||
| reports { | ||
|
|
@@ -123,16 +122,16 @@ jacocoTestReport { | |
| } | ||
| } | ||
|
|
||
| javadoc { | ||
| options.encoding = "UTF-8" | ||
| if (JavaVersion.current().isJava9Compatible()) { | ||
| options.addBooleanOption("html5", true) | ||
| } | ||
| } | ||
|
|
||
| if (project.hasProperty("signing.keyId")) { | ||
| apply plugin: 'signing' | ||
| apply plugin: "signing" | ||
| signing { | ||
| sign publishing.publications.mavenJava | ||
| } | ||
| } | ||
|
|
||
| javadoc { | ||
| options.encoding = "UTF-8" | ||
| if (JavaVersion.current().isJava9Compatible()) { | ||
| options.addBooleanOption('html5', true) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| groupId=com.github.goodforgod | ||
| artifactId=dummymaker | ||
| artifactVersion=3.0.2 | ||
| artifactVersion=3.1.0 | ||
|
|
||
|
|
||
| ##### GRADLE | ||
| ##### GRADLE ##### | ||
| org.gradle.daemon=true | ||
| org.gradle.parallel=true | ||
| org.gradle.configureondemand=true | ||
| org.gradle.caching=true | ||
| org.gradle.jvmargs=-Dfile.encoding=UTF-8 |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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-6.7-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -72,7 +72,7 @@ case "`uname`" in | |
| Darwin* ) | ||
| darwin=true | ||
| ;; | ||
| MINGW* ) | ||
| MSYS* | MINGW* ) | ||
| msys=true | ||
| ;; | ||
| NONSTOP* ) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.