Skip to content

Commit

Permalink
update of gradle to new version 8.6
Browse files Browse the repository at this point in the history
  • Loading branch information
astrapisixtynine committed Feb 21, 2024
1 parent 6dd68ff commit 951e5d7
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 40 deletions.
30 changes: 15 additions & 15 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@ projectRepositoriesPasswordKey=ossrhPassword
###########################
# gradle-plugins versions #
###########################
gradlePluginVersionsVersion=0.50.0
gradlePluginVersionsVersion=0.51.0
licenseGradlePluginVersion=0.16.1
gradlePluginLombokVersion=8.4
gradlePluginLombokVersion=8.6
gradleIzpackPluginVersion=3.2
grgitGradlePluginVersion=5.2.1
spotlessGradlePluginVersion=6.22.0
grgitGradlePluginVersion=5.2.2
spotlessGradlePluginVersion=6.25.0
############################
# IzPackInstaller property #
############################
createIzPackInstaller=false
#########################
# dependencies versions #
#########################
izpackVersion=5.2.0
izpackVersion=5.2.1
lombokVersion=1.18.30
modelDataVersion=3.1
swingComponentsVersion=9
Expand All @@ -54,38 +54,38 @@ menuActionVersion=3.4
swingWorkerVersion=1.1
swingLayoutVersion=1.0.3
swingxAllVersion=1.6.5-1
miglayoutSwingVersion=11.2
miglayoutSwingVersion=11.3
jxlayerVersion=3.0.4
javahelpVersion=2.0.05
jobjCoreVersion=8.1
jobjCoreVersion=8.2
xstreamVersion=1.4.20
throwableVersion=2.3
cryptApiVersion=8.7
cryptDataVersion=8.5
mysticCryptVersion=8.1
bouncycastleVersion=1.70
checksumUpVersion=2.2
checksumUpVersion=3
xmlExtensionsVersion=8.2
guavaVersion=32.1.3-jre
guavaVersion=33.0.0-jre
fileWorkerVersion=17.1
sillyCollectionVersion=27
sillyBeanVersion=2
randomizerVersion=10.2
gsonExtensionsVersion=2.1
jsonExtensionsVersion=2.4
jacksonVersion=2.16.0
jacksonVersion=2.16.1
tangoIconThemeVersion=0.8.90
silkIconThemeVersion=1
pf4jVersion=3.10.0
commonsCodecVersion=1.16.0
commonsCodecVersion=1.16.1
netExtensionsVersion=5.2
genTreeVersion=9
treeApiVersion=1.5
iconImgExtensionsVersion=3.2
jremixIconVersion=1.1
batikVersion=1.17
imgscalrLibVersion=4.2
sqliteJdbcVersion=3.44.0.0
sqliteJdbcVersion=3.45.1.0
commonsLang3Version=3.14.0
sillyIoVersion=3
designPatternObserverVersion=6
Expand All @@ -102,7 +102,7 @@ resourceViewmodelVersion=6
jobjClonerVersion=2.1
lGoodDatePickerVersion=11.2.1
autoBrowserVersion=2.0.6
awtExtensionsVersion=1.1
awtExtensionsVersion=1.2
swingModelComponentsVersion=1
xstreamExtensionsVersion=1.1
swingMenuPf4jPluginVersion=1.0.0-SNAPSHOT
Expand All @@ -113,8 +113,8 @@ keePassJava2Version=2.2.1
testObjectVersion=8.2
junitJupiterExtensionsVersion=1.1
assertjSwingVersion=3.17.1
junitJupiterVersion=5.10.1
junitPlatformLauncherVersion=1.10.1
junitJupiterVersion=5.10.2
junitPlatformLauncherVersion=1.10.2
##################
# jar properties #
##################
Expand Down
34 changes: 17 additions & 17 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,35 @@ dependencies {
compileOnly("org.projectlombok:lombok:$lombokVersion")
annotationProcessor("org.projectlombok:lombok:$lombokVersion")

implementation("io.github.astrapi69:observer:$designPatternObserverVersion")
implementation("io.github.astrapi69:state:$designPatternStateVersion")
implementation("io.github.astrapi69:eventbus:$designPatternEventbusVersion")
implementation("io.github.astrapi69:visitor:$designVisitorPatternsVersion")
implementation("org.pf4j:pf4j:$pf4jVersion")
implementation("com.miglayout:miglayout-swing:$miglayoutSwingVersion")
implementation("com.google.code.gson:gson:$gsonVersion")
implementation("com.google.guava:guava:$guavaVersion")
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
implementation("com.thoughtworks.xstream:xstream:$xstreamVersion")
implementation("com.github.lgooddatepicker:LGoodDatePicker:$lGoodDatePickerVersion")
implementation("commons-codec:commons-codec:$commonsCodecVersion")
implementation("javax.help:javahelp:$javahelpVersion")
implementation("org.pf4j:pf4j:$pf4jVersion")
implementation("org.swinglabs:swing-layout:$swingLayoutVersion")
implementation("org.swinglabs:jxlayer:$jxlayerVersion")
implementation("org.swinglabs:swing-worker:$swingWorkerVersion")
implementation("org.swinglabs.swingx:swingx-all:$swingxAllVersion")
implementation("com.miglayout:miglayout-swing:$miglayoutSwingVersion")
implementation("commons-codec:commons-codec:$commonsCodecVersion")
implementation("org.apache.commons:commons-lang3:$commonsLang3Version")
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
implementation("com.thoughtworks.xstream:xstream:$xstreamVersion")
implementation("org.bouncycastle:bcprov-jdk15on:$bouncycastleVersion")
implementation("org.bouncycastle:bcprov-ext-jdk15on:$bouncycastleVersion")
implementation("org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion")
implementation("org.apache.xmlgraphics:batik-transcoder:$batikVersion")
implementation("org.apache.xmlgraphics:batik-codec:$batikVersion")
implementation("org.imgscalr:imgscalr-lib:$imgscalrLibVersion")
implementation("org.xerial:sqlite-jdbc:$sqliteJdbcVersion")
implementation("org.kquiet:auto-browser:$autoBrowserVersion")
implementation("org.freedesktop.tango:tango-icon-theme:$tangoIconThemeVersion")
implementation("io.github.astrapi69:observer:$designPatternObserverVersion")
implementation("io.github.astrapi69:state:$designPatternStateVersion")
implementation("io.github.astrapi69:eventbus:$designPatternEventbusVersion")
implementation("io.github.astrapi69:visitor:$designVisitorPatternsVersion")
implementation("io.github.astrapi69:icon-img-extensions:$iconImgExtensionsVersion")
implementation("io.github.astrapi69:jremix-icon:$jremixIconVersion")
implementation("org.freedesktop.tango:tango-icon-theme:$tangoIconThemeVersion")
implementation("io.github.astrapi69:silk-icon-theme:$silkIconThemeVersion")
implementation("io.github.astrapi69:silly-collection:$sillyCollectionVersion")
implementation("io.github.astrapi69:silly-bean:$sillyBeanVersion")
Expand All @@ -49,23 +56,16 @@ dependencies {
implementation("io.github.astrapi69:menu-action:$menuActionVersion")
implementation("io.github.astrapi69:net-extensions:$netExtensionsVersion")
implementation("io.github.astrapi69:gen-tree:$genTreeVersion")
implementation("org.apache.xmlgraphics:batik-transcoder:$batikVersion")
implementation("org.apache.xmlgraphics:batik-codec:$batikVersion")
implementation("org.imgscalr:imgscalr-lib:$imgscalrLibVersion")
implementation("org.xerial:sqlite-jdbc:$sqliteJdbcVersion")
implementation("io.github.astrapi69:jobj-copy:$jobjCopyVersion")
implementation("io.github.astrapi69:data-api:$dataApiVersion")
implementation("io.github.astrapi69:id-generate:$idGenerateVersion")
implementation("io.github.astrapi69:xml-extensions:$xmlExtensionsVersion")
implementation("io.github.astrapi69:gson-extensions:$gsonExtensionsVersion")
implementation("com.google.code.gson:gson:$gsonVersion")
implementation("io.github.astrapi69:xstream-extensions:$xstreamExtensionsVersion")
implementation("io.github.astrapi69:resourcebundle-core:$resourcebundleCoreVersion")
implementation("io.github.astrapi69:resource-viewmodels:$resourceViewmodelVersion")
implementation("com.github.lgooddatepicker:LGoodDatePicker:$lGoodDatePickerVersion")
implementation("io.github.astrapi69:tree-api:$treeApiVersion")
implementation("io.github.astrapi69:jobj-cloner:$jobjClonerVersion")
implementation("org.kquiet:auto-browser:$autoBrowserVersion")
implementation("io.github.astrapi69:awt-extensions:$awtExtensionsVersion")
implementation("io.github.astrapi69:swing-model-components:$swingModelComponentsVersion")
implementation("io.github.astrapi69:swing-menu-pf4j-plugin:$swingMenuPf4jPluginVersion")
Expand Down
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 @@
#Mon May 11 15:57:08 CEST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import io.github.astrapi69.file.create.FileFactory;
import io.github.astrapi69.file.delete.DeleteFileExtensions;
import io.github.astrapi69.file.system.SystemFileExtensions;
import io.github.astrapi69.file.write.WriteFileExtensions;
import io.github.astrapi69.file.write.StoreFileExtensions;
import io.github.astrapi69.io.file.FileExtension;
import io.github.astrapi69.mystic.crypt.ApplicationModelBean;
import io.github.astrapi69.mystic.crypt.file.PBEFileEncryptor;
Expand Down Expand Up @@ -120,13 +120,12 @@ public static File saveToFileWithPrivateKey(ApplicationModelBean applicationMode

xml = ObjectToXmlExtensions.toXml(applicationModelBean);

RuntimeExceptionDecorator
.decorate(() -> WriteFileExtensions.string2File(applicationFile, xml));
RuntimeExceptionDecorator.decorate(() -> StoreFileExtensions.toFile(applicationFile, xml));

encrypt = RuntimeExceptionDecorator.decorate(() -> genericEncryptor.encrypt(xml));

RuntimeExceptionDecorator
.decorate(() -> WriteFileExtensions.storeByteArrayToFile(encrypt, applicationFile));
.decorate(() -> StoreFileExtensions.toFile(applicationFile, encrypt));
return applicationFile;
}

Expand Down Expand Up @@ -181,7 +180,7 @@ public static File saveToFileWithPasswordAndPrivateKey(
.decorate(() -> genericEncryptor.encrypt(encryptedJson));

RuntimeExceptionDecorator
.decorate(() -> WriteFileExtensions.storeByteArrayToFile(encrypt, applicationFile));
.decorate(() -> StoreFileExtensions.toFile(applicationFile, encrypt));
return applicationFile;
}

Expand Down Expand Up @@ -210,8 +209,7 @@ public static File saveToFileWithPassword(ApplicationModelBean applicationModelB
applicationFile, FileExtension.MYSTIC_CRYPT_ENCRYPTED.getExtension()));

xml = ObjectToXmlExtensions.toXml(applicationModelBean);
RuntimeExceptionDecorator
.decorate(() -> WriteFileExtensions.string2File(tempJsonFile, xml));
RuntimeExceptionDecorator.decorate(() -> StoreFileExtensions.toFile(tempJsonFile, xml));

File encryptedApplicationFile = RuntimeExceptionDecorator
.decorate(() -> encryptor.encrypt(tempJsonFile));
Expand Down

0 comments on commit 951e5d7

Please sign in to comment.