build(deps): bump the dependencies group across 1 directory with 6 up…

…dates (#40) * build(deps): bump the dependencies group across 1 directory with 6 updates Bumps the dependencies group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.antlr:antlr4](https://github.com/antlr/antlr4) | `4.13.1` | `4.13.2` | | [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) | `0.4.2` | `0.5.0` | | org.apache.commons:commons-lang3 | `3.14.0` | `3.15.0` | | [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) | `1.9.24` | `2.0.0` | | org.jetbrains.intellij | `1.17.3` | `1.17.4` | | org.jetbrains.grammarkit | `2022.3.2` | `2022.3.2.2` | Updates `org.antlr:antlr4` from 4.13.1 to 4.13.2 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/dev/CHANGES.txt) - [Commits](antlr/antlr4@4.13.1...4.13.2) Updates `dev.openfga:openfga-sdk` from 0.4.2 to 0.5.0 - [Release notes](https://github.com/openfga/java-sdk/releases) - [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md) - [Commits](openfga/java-sdk@v0.4.2...v0.5.0) Updates `org.apache.commons:commons-lang3` from 3.14.0 to 3.15.0 Updates `org.jetbrains.kotlin.jvm` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.9.24...v2.0.0) Updates `org.jetbrains.intellij` from 1.17.3 to 1.17.4 Updates `org.jetbrains.grammarkit` from 2022.3.2 to 2022.3.2.2 --- updated-dependencies: - dependency-name: org.antlr:antlr4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: dev.openfga:openfga-sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: org.jetbrains.intellij dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.jetbrains.grammarkit dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * fix: updating parameters for lexer & parser --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Jeffery <[email protected]>
openfga · Aug 8, 2024 · 966ec3f · 966ec3f
1 parent 114da44
commit 966ec3f
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 110 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
  id("java")
  id("jacoco")
  id("com.diffplug.spotless") version "6.25.0"
- id("org.jetbrains.kotlin.jvm") version "1.9.24"
- id("org.jetbrains.intellij") version "1.17.3"
- id("org.jetbrains.grammarkit") version "2022.3.2"
+ id("org.jetbrains.kotlin.jvm") version "2.0.0"
+ id("org.jetbrains.intellij") version "1.17.4"
+ id("org.jetbrains.grammarkit") version "2022.3.2.2"
 }
 
 group = "dev.openfga.intellijplugin"
@@ -16,11 +18,11 @@ repositories {
 }
 
 dependencies {
- implementation("org.antlr:antlr4:4.13.1")
- implementation("dev.openfga:openfga-sdk:0.4.2")
+ implementation("org.antlr:antlr4:4.13.2")
+ implementation("dev.openfga:openfga-sdk:0.5.0")
  implementation("org.dmfs:oauth2-essentials:0.22.1")
  implementation("org.dmfs:httpurlconnection-executor:1.22.1")
- implementation("org.apache.commons:commons-lang3:3.14.0")
+ implementation("org.apache.commons:commons-lang3:3.15.0")
  implementation("dev.openfga:openfga-language:v0.2.0-beta.1")
 
  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
@@ -56,9 +58,7 @@ spotless {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
- kotlinOptions {
- jvmTarget = "17"
- }
+ compilerOptions.jvmTarget = JvmTarget.JVM_17
 }
 
 tasks.withType<JavaCompile>().configureEach {
@@ -76,14 +76,13 @@ tasks {
 
  generateLexer {
  sourceFile.set(file("src/main/java/dev/openfga/intellijplugin/parsing/OpenFGALexer.flex"))
- targetDir.set("src/generated/java/dev/openfga/intellijplugin/parsing")
- targetClass.set("OpenFGALexer")
+ targetOutputDir.set(file("src/generated/java/dev/openfga/intellijplugin/parsing"))
  purgeOldFiles.set(true)
  }
 
  generateParser {
  sourceFile.set(file("src/main/java/dev/openfga/intellijplugin/parsing/openfga.bnf"))
- targetRoot.set("src/generated/java")
+ targetRootOutputDir.set(file("src/generated/java"))
  pathToParser.set("dev/openfga/intellijplugin/parsing/OpenFGAParser.java")
  pathToPsiRoot.set("dev/openfga/intellijplugin/psi")
  purgeOldFiles.set(true)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -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/.
@@ -80,13 +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##*/}
-
-# 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
+
+# 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"'
+
 # Collect all arguments for the java command;
 # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 # shell script including quotes and variable substitutions, so put them in
@@ -205,6 +213,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
@@ -1,89 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+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%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+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!
+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
+
+:omega