Skip to content

Commit 322602a

Browse files
authored
Update dependency versions (#11)
1 parent 0eb3457 commit 322602a

File tree

8 files changed

+38
-17
lines changed

8 files changed

+38
-17
lines changed

.github/workflows/build-on-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v3
10-
- name: Set up JDK 11
10+
- name: Set up JDK 17
1111
uses: actions/setup-java@v3
1212
with:
13-
java-version: '11'
13+
java-version: '17'
1414
distribution: 'temurin'
1515
- name: Assemble the jar
1616
run: ./gradlew assemble

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111

12-
- name: Set up JDK 11
12+
- name: Set up JDK 17
1313
uses: actions/setup-java@v3
1414
with:
15-
java-version: '11'
15+
java-version: '17'
1616
distribution: 'temurin'
1717

1818
- name: Validate Gradle wrapper

build.gradle.kts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ group = "com.github.monosoul"
88
version = "0.1.2-SNAPSHOT"
99

1010
plugins {
11-
id("org.jetbrains.intellij") version "1.5.3"
12-
kotlin("jvm") version "1.6.21"
11+
id("org.jetbrains.intellij") version "1.7.0"
12+
kotlin("jvm") version "1.7.10"
1313
jacoco
1414
}
1515

1616
intellij {
17-
version.set("221.5080.210")
17+
version.set("222.3345.118")
1818
pluginName.set("Git extended update-index")
1919
updateSinceUntilBuild.set(true)
2020
sameSinceUntilBuild.set(false)
@@ -26,8 +26,9 @@ dependencies {
2626

2727
testImplementation(platform("org.junit:junit-bom:5.8.2"))
2828
testImplementation("org.junit.jupiter:junit-jupiter")
29+
testImplementation("org.junit.platform:junit-platform-launcher")
2930
testImplementation("io.strikt:strikt-jvm:0.34.1")
30-
testImplementation("io.mockk:mockk:1.12.3")
31+
testImplementation("io.mockk:mockk:1.12.4")
3132
testImplementation("org.apache.commons:commons-lang3:3.12.0")
3233
}
3334

@@ -45,6 +46,13 @@ tasks {
4546

4647
"test"(Test::class) {
4748
useJUnitPlatform()
49+
jvmArgs(
50+
"--add-exports=java.base/sun.nio.ch=ALL-UNNAMED",
51+
"--add-opens=java.base/java.lang=ALL-UNNAMED",
52+
"--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
53+
"--add-opens=java.base/java.io=ALL-UNNAMED",
54+
"--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED"
55+
)
4856

4957
testLogging {
5058
events = setOf(PASSED, SKIPPED, FAILED)
@@ -58,7 +66,7 @@ tasks {
5866

5967
withType<KotlinCompile> {
6068
kotlinOptions {
61-
jvmTarget = "11"
69+
jvmTarget = "17"
6270
freeCompilerArgs = listOf("-Xjsr305=strict")
6371
}
6472
}

gradle/wrapper/gradle-wrapper.jar

935 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ set -- \
205205
org.gradle.wrapper.GradleWrapperMain \
206206
"$@"
207207

208+
# Stop when "xargs" is not available.
209+
if ! command -v xargs >/dev/null 2>&1
210+
then
211+
die "xargs is not available"
212+
fi
213+
208214
# Use "xargs" to parse quoted args.
209215
#
210216
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,7 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
43+
if %ERRORLEVEL% equ 0 goto execute
4444

4545
echo.
4646
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
7575

7676
:end
7777
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
78+
if %ERRORLEVEL% equ 0 goto mainEnd
7979

8080
:fail
8181
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8282
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
83+
set EXIT_CODE=%ERRORLEVEL%
84+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
85+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
86+
exit /b %EXIT_CODE%
8587

8688
:mainEnd
8789
if "%OS%"=="Windows_NT" endlocal

src/main/resources/META-INF/plugin.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
]]></description>
1919

2020
<change-notes><![CDATA[
21+
<b>Release 0.1.2:</b>
22+
<ul>
23+
<li>Use the latest IntelliJ API.</li>
24+
</ul>
25+
<br>
2126
<b>Release 0.1.1:</b>
2227
<ul>
2328
<li>Use the latest IntelliJ API.</li>
@@ -59,7 +64,7 @@
5964
]]>
6065
</change-notes>
6166

62-
<idea-version since-build="221.5080.210"/>
67+
<idea-version since-build="222.3345.118"/>
6368
<depends>com.intellij.modules.platform</depends>
6469
<depends>com.intellij.modules.vcs</depends>
6570
<depends>Git4Idea</depends>

0 commit comments

Comments
 (0)