Skip to content

Commit

Permalink
bump gradle to 8.5. bump kotlin to 1.9.21.
Browse files Browse the repository at this point in the history
  • Loading branch information
liplum committed Dec 11, 2023
1 parent 44328ec commit 37324ef
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 14 deletions.
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import net.liplum.gradle.settings.Settings.localConfig

plugins {
kotlin("jvm") apply false
id("com.google.devtools.ksp") version "1.9.21-1.0.15"
id("io.github.liplum.mgpp") version "1.3.0"
}
buildscript {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
kotlin("jvm") version "1.6.21"
kotlin("jvm") version "1.9.20"
groovy
java
}
buildscript {
dependencies {
classpath(kotlin("gradle-plugin", version = "1.6.21"))
classpath(kotlin("gradle-plugin", version = "1.9.20"))
}
}
repositories {
Expand Down
4 changes: 2 additions & 2 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import net.liplum.gradle.mktxApi

plugins {
kotlin("jvm")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
`maven-publish`
id("io.github.liplum.mgpp")
id("com.google.devtools.ksp")
}

sourceSets {
Expand All @@ -21,7 +21,7 @@ sourceSets {

kotlin.sourceSets.main {
kotlin.srcDirs(
file("$buildDir/generated/ksp/main/kotlin"),
file("${layout.buildDirectory}/generated/ksp/main/kotlin"),
)
}
val mktxVersion: String by project
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
8 changes: 4 additions & 4 deletions main/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm")
`maven-publish`
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp")
id("io.github.liplum.mgpp")
}
val PlumyVersion: String by project
Expand All @@ -20,7 +20,7 @@ sourceSets {
main {
java.srcDirs(
"src",
"$buildDir/generated/classGen",
"${layout.buildDirectory}/generated/classGen",
)
resources.srcDir("resources")
}
Expand All @@ -32,8 +32,8 @@ sourceSets {

kotlin.sourceSets.main {
kotlin.srcDirs(
file("$buildDir/generated/ksp/main/kotlin"),
file("$buildDir/generated/classGen"),
file("${layout.buildDirectory}/generated/ksp/main/kotlin"),
file("${layout.buildDirectory}/generated/classGen"),
)
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pluginManagement {
}

plugins {
kotlin("jvm") version "1.8.0"
kotlin("jvm") version "1.9.21"
}
}
include(
Expand Down

0 comments on commit 37324ef

Please sign in to comment.