Skip to content

Commit

Permalink
more updates, crucially dokkaversion to 1.9.20
Browse files Browse the repository at this point in the history
  • Loading branch information
Bdegraaf1234 committed Mar 22, 2024
1 parent c297fd0 commit 285a3ad
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled_snyk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ subprojects {
}

tasks.withType<JavaCompile> {
options.release.set(11)
options.release.set(17)
}

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "11"
apiVersion = "1.7"
languageVersion = "1.7"
jvmTarget = "17"
apiVersion = "1.9"
languageVersion = "1.9"
}
}

Expand Down Expand Up @@ -212,5 +212,5 @@ nexusPublishing {
}

tasks.wrapper {
gradleVersion = "7.6"
gradleVersion = "8.3"
}
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ org.gradle.vfs.watch=true
kotlin.code.style=official

kotlinVersion=1.9.22
dokkaVersion=1.7.20
dokkaVersion=1.9.20
jsoupVersion=1.15.3

jerseyVersion=3.1.0
grizzlyVersion=4.0.0
okhttpVersion=4.12.0
junitVersion=5.9.1
hamcrestVersion=2.2
mockitoKotlinVersion=4.1.0
mockitoKotlinVersion=5.2.1

hk2Version=3.0.3
managementPortalVersion=0.8.2
managementPortalVersion=0.8.3
javaJwtVersion=4.2.1
jakartaWsRsVersion=3.1.0
jakartaAnnotationVersion=2.1.1
Expand All @@ -32,7 +32,7 @@ jakartaActivation=2.1.0
swaggerVersion=2.2.9
mustacheVersion=0.9.10

hibernateVersion=6.1.5.Final
liquibaseVersion=4.21.0
hibernateVersion=6.4.2.Final
liquibaseVersion=4.25.1
postgresVersion=42.7.2
h2Version=2.1.214
h2Version=2.2.224
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 285a3ad

Please sign in to comment.