diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d459295..7ee6ee5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: timeout-minutes: 10 steps: - uses: fkirc/skip-duplicate-actions@master - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - uses: actions/setup-java@v3 with: @@ -53,7 +53,7 @@ jobs: needs: deploy steps: - name: "Call Cloudflare API" - uses: indiesdev/curl@v1.1 + uses: indiesdev/curl@v1 with: method: "POST" url: https://api.cloudflare.com/client/v4/zones/0dd93531047ba376c2a1167f841c2bfd/purge_cache diff --git a/.gitignore b/.gitignore index b8b688d..37f63a4 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ dist/ !dist/favicon.ico .idea/jsonSchemas.xml .idea/kotlinc.xml +.idea/jpa-buddy.xml diff --git a/build.gradle b/build.gradle index 4efa3c3..81d0b8f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - kotlin_version = "1.7.21" - serialization_version = "1.4.1" + kotlin_version = "1.9.0" + serialization_version = "1.6.0" } repositories { google() diff --git a/generator/build.gradle b/generator/build.gradle index c9e75eb..657d4cb 100644 --- a/generator/build.gradle +++ b/generator/build.gradle @@ -10,9 +10,9 @@ mainClassName = 'MainKt' dependencies { implementation project(":pojos") implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version" - implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0' + implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.9.1' - testImplementation platform('org.junit:junit-bom:5.9.0') + testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation "org.junit.jupiter:junit-jupiter" } @@ -22,13 +22,3 @@ test { events "passed", "skipped", "failed" } } - -compileKotlin { - kotlinOptions { - jvmTarget = 11 - freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"] - } -} -compileTestKotlin { - kotlinOptions.jvmTarget = 11 -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8fad3f5..a1f2792 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-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..a69d9cb 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/pojos/build.gradle b/pojos/build.gradle index 3f0c36f..e03de63 100644 --- a/pojos/build.gradle +++ b/pojos/build.gradle @@ -9,13 +9,6 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version" } -compileKotlin { - kotlinOptions.jvmTarget = 11 -} -compileTestKotlin { - kotlinOptions.jvmTarget = 11 -} - java { withJavadocJar() withSourcesJar()