From c19193370df720e4c96092247f1445abddfd691d Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Thu, 28 Jul 2022 14:38:57 +0200 Subject: [PATCH] build: Update build settings --- VERSION | 1 + docs/guide/guide.gradle | 2 +- gradle.properties | 34 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../json-lib-core/json-lib-core.gradle | 2 +- 5 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..a8e8e5ad --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3.0.2-SNAPSHOT diff --git a/docs/guide/guide.gradle b/docs/guide/guide.gradle index 8f9fb3ad..e2baaa14 100644 --- a/docs/guide/guide.gradle +++ b/docs/guide/guide.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.kordamp.gradle.guide' - id 'org.ajoberstar.git-publish' + // id 'org.ajoberstar.git-publish' } configurations { diff --git a/gradle.properties b/gradle.properties index 2c8afed4..563f645c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,22 +16,22 @@ # limitations under the License. # -group = org.kordamp.json -version = 3.0.2-SNAPSHOT -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +group = org.kordamp.json +sourceCompatibility = 1.8 +targetCompatibility = 1.8 -previousVersion = 3.0.1 -commonsLangVersion = 3.9 -commonsBeanutilsVersion = 1.9.3 -ezmorphVersion = 3.0.0 -jacocoVersion = 0.8.6 -junitVersion = 4.13 -slf4jVersion = 1.7.30 -kordampPluginVersion = 0.41.0 -kordampBuildVersion = 2.0.0 -gitPluginVersion = 3.0.0 +previousVersion = 3.0.1 +commonsLangVersion = 3.9 +commonsBeanutilsVersion = 1.9.3 +commonsCollections4Version = 4.4 +ezmorphVersion = 3.0.0 +jacocoVersion = 0.8.6 +junitVersion = 4.13.2 +slf4jVersion = 1.7.32 +kordampPluginVersion = 0.46.0 +kordampBuildVersion = 2.5.0 +gitPluginVersion = 3.0.0 -org.gradle.daemon = true -org.gradle.caching = true -org.gradle.parallel = false +org.gradle.daemon = true +org.gradle.caching = true +org.gradle.parallel = false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383e..ec991f9a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/subprojects/json-lib-core/json-lib-core.gradle b/subprojects/json-lib-core/json-lib-core.gradle index 3bd40c28..57cff670 100644 --- a/subprojects/json-lib-core/json-lib-core.gradle +++ b/subprojects/json-lib-core/json-lib-core.gradle @@ -28,7 +28,7 @@ config { dependencies { api("junit:junit:$junitVersion") api("commons-beanutils:commons-beanutils:$commonsBeanutilsVersion") - api('org.apache.commons:commons-collections4:4.4') + api("org.apache.commons:commons-collections4:$commonsCollections4Version") api("org.apache.commons:commons-lang3:$commonsLangVersion") api("org.slf4j:slf4j-api:$slf4jVersion")