Skip to content

Commit

Permalink
Bump some versions to get it to build
Browse files Browse the repository at this point in the history
- Java target to v11
- Kotlin to 1.9.10 (latest supported by Gradle)
- Gradle to 8.4 (latest)
- Netty to 4.1.100.Final (latest - to resolve CVEs)
- asciidoctorJ to 2.5.10 (latest)
- asciiDoctorPlugin to 3.3.2 (latest - for JDK11 support)
  • Loading branch information
davidwheeler123 committed Nov 5, 2023
1 parent c271a3d commit d6d2470
Show file tree
Hide file tree
Showing 8 changed files with 195 additions and 125 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
pg: [10, 11, 12, 13]
jdk: [8, 11]
jdk: [11, 17]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
Expand Down
3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

plugins {
id("java-library")
id("org.jetbrains.kotlin.jvm") version "1.4.31" // Must match Gradle version
id("org.jetbrains.kotlin.jvm") version "1.9.10" // Must match Gradle version
}

repositories {
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ object Versions {
/**
* Source
*/
val javaTarget = JavaVersion.VERSION_1_8
const val kotlin = "1.4.31"
val javaTarget = JavaVersion.VERSION_11
const val kotlin = "1.9.10"

/**
* Required Libraries
*/
const val netty = "4.1.79.Final"
const val netty = "4.1.100.Final"

/**
* Tooling Libraries
*/
const val javaPoet = "1.13.0"
const val argParser = "2.0.7"
const val asciidoctorJ = "2.4.3"
const val asciidoctorJ = "2.5.10"

/**
* Testing dependencies
Expand All @@ -35,7 +35,7 @@ object Versions {
const val kotlinPlugin = kotlin
const val shadowPlugin = "7.0.0"
const val dockerComposePlugin = "0.14.2"
const val asciiDoctorPlugin = "3.2.0"
const val asciiDoctorPlugin = "3.3.2"
const val gitPublishPlugin = "3.0.0"
const val testLoggerPlugin = "3.0.0"
const val githubReleasePlugin = "2.2.12"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit d6d2470

Please sign in to comment.