diff --git a/.idea/libraries/antlr_4_9_complete.xml b/.idea/libraries/antlr_4_9_complete.xml index a60ab6605..8db4116d5 100644 --- a/.idea/libraries/antlr_4_9_complete.xml +++ b/.idea/libraries/antlr_4_9_complete.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/libraries/antlr_runtime_4_9.xml b/.idea/libraries/antlr_runtime_4_9.xml index 719f41216..cd7a59037 100644 --- a/.idea/libraries/antlr_runtime_4_9.xml +++ b/.idea/libraries/antlr_runtime_4_9.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/libraries/kotlinx_cli_jvm.xml b/.idea/libraries/kotlinx_cli_jvm.xml index 759bb47a8..2233ef7ae 100644 --- a/.idea/libraries/kotlinx_cli_jvm.xml +++ b/.idea/libraries/kotlinx_cli_jvm.xml @@ -1,7 +1,7 @@ - + diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..01be52b10 --- /dev/null +++ b/build.gradle @@ -0,0 +1,3 @@ +plugins { + id "org.jetbrains.kotlin.jvm" version "1.5.10" apply false +} diff --git a/compiler/build.gradle b/compiler/build.gradle index 77ca5cff4..037f8515a 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -1,13 +1,14 @@ plugins { id 'java' id 'application' - id "org.jetbrains.kotlin.jvm" version "1.5.10" - id 'com.github.johnrengelman.shadow' version '6.1.0' + id "org.jetbrains.kotlin.jvm" + id 'com.github.johnrengelman.shadow' version '7.0.0' } targetCompatibility = 11 sourceCompatibility = 11 + repositories { mavenLocal() mavenCentral() @@ -21,8 +22,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.2' - // implementation 'net.razorvine:ksim65:1.8' - // implementation "com.github.hypfvieh:dbus-java:3.2.4" testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2' @@ -30,6 +29,20 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2' } +configurations.all { + exclude group: 'com.ibm.icu', module: 'icu4j' + exclude group: "org.antlr", module: "antlr4" +} + +configurations { + // strange antlr plugin issue, see https://github.com/gradle/gradle/issues/820 + // this avoids linking in the complete antlr binary jar + compile { + extendsFrom = extendsFrom.findAll { it != configurations.antlr } + } +} + + compileKotlin { kotlinOptions { jvmTarget = "11" @@ -66,7 +79,6 @@ startScripts.enabled = true application { mainClass = 'prog8.CompilerMainKt' - mainClassName = 'prog8.CompilerMainKt' // deprecated applicationName = 'p8compile' } @@ -94,8 +106,3 @@ test { events "skipped", "failed" } } - - -task wrapper(type: Wrapper) { - gradleVersion = '6.7' -} diff --git a/compiler/lib/kotlinx-cli-jvm-0.3.1.jar b/compiler/lib/kotlinx-cli-jvm-0.3.1.jar deleted file mode 100644 index 9b93814ca..000000000 Binary files a/compiler/lib/kotlinx-cli-jvm-0.3.1.jar and /dev/null differ diff --git a/compiler/lib/kotlinx-cli-jvm-0.3.2.jar b/compiler/lib/kotlinx-cli-jvm-0.3.2.jar new file mode 100644 index 000000000..5225f4fcb Binary files /dev/null and b/compiler/lib/kotlinx-cli-jvm-0.3.2.jar differ diff --git a/compilerAst/build.gradle b/compilerAst/build.gradle index 258986ce1..78f7d8fd3 100644 --- a/compilerAst/build.gradle +++ b/compilerAst/build.gradle @@ -1,7 +1,6 @@ plugins { - id 'antlr' id 'java' - id "org.jetbrains.kotlin.jvm" version "1.5.10" + id "org.jetbrains.kotlin.jvm" } targetCompatibility = 11 @@ -12,27 +11,18 @@ repositories { } -configurations { - // strange antlr plugin issue, see https://github.com/gradle/gradle/issues/820 - // this avoids linking in the complete antlr binary jar - compile { - extendsFrom = extendsFrom.findAll { it != configurations.antlr } - } -} - dependencies { - antlr 'org.antlr:antlr4:4.9' - implementation 'org.antlr:antlr4-runtime:4.9' + implementation 'org.antlr:antlr4-runtime:4.9.2' implementation project(':parser') testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2' testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2' +} -// antlr('org.antlr:antlr4:4.9') { -// exclude group: 'com.ibm.icu', module: 'icu4j' -// } +configurations.all { + exclude group: 'com.ibm.icu', module: 'icu4j' } compileKotlin { @@ -79,7 +69,3 @@ test { events "skipped", "failed" } } - -task wrapper(type: Wrapper) { - gradleVersion = '6.7' -} diff --git a/dbusCompilerService/build.gradle b/dbusCompilerService/build.gradle index b8fa95dd9..d3dc27882 100644 --- a/dbusCompilerService/build.gradle +++ b/dbusCompilerService/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java' id 'application' - id "org.jetbrains.kotlin.jvm" version "1.5.10" - id 'com.github.johnrengelman.shadow' version '6.1.0' + id "org.jetbrains.kotlin.jvm" + id 'com.github.johnrengelman.shadow' version '7.0.0' } targetCompatibility = 11 @@ -28,6 +28,11 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2' } +configurations.all { + exclude group: 'com.ibm.icu', module: 'icu4j' + exclude group: "org.antlr", module: "antlr4" +} + compileKotlin { kotlinOptions { jvmTarget = "11" @@ -62,8 +67,7 @@ startScripts.enabled = true application { mainClass = 'prog8.dbus.TestdbusKt' - mainClassName = 'prog8.dbus.TestdbusKt' // deprecated - applicationName = 'testdbus' + applicationName = 'prog8compilerservicedbus' } artifacts { @@ -90,7 +94,3 @@ test { events "skipped", "failed" } } - -task wrapper(type: Wrapper) { - gradleVersion = '6.7' -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c0535..e708b1c02 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 be52383ef..0f80bbf51 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-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c5158..4f906e0c8 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index a9f778a7a..ac1b06f93 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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 init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ 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 %CMD_LINE_ARGS% +"%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 diff --git a/httpCompilerService/build.gradle b/httpCompilerService/build.gradle index 7278f7999..b450944e9 100644 --- a/httpCompilerService/build.gradle +++ b/httpCompilerService/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java' id 'application' - id "org.jetbrains.kotlin.jvm" version "1.5.10" - id 'com.github.johnrengelman.shadow' version '6.1.0' + id "org.jetbrains.kotlin.jvm" + id 'com.github.johnrengelman.shadow' version '7.0.0' } targetCompatibility = 11 @@ -31,6 +31,12 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2' } +configurations.all { + exclude group: 'com.ibm.icu', module: 'icu4j' + exclude group: "org.antlr", module: "antlr4" +} + + compileKotlin { kotlinOptions { jvmTarget = "11" @@ -65,8 +71,7 @@ startScripts.enabled = true application { mainClass = 'prog8.http.TestHttpKt' - mainClassName = 'prog8.http.TestHttpKt' // deprecated - applicationName = 'testhttp' + applicationName = 'prog8compilerservicehttp' } artifacts { @@ -93,7 +98,3 @@ test { events "skipped", "failed" } } - -task wrapper(type: Wrapper) { - gradleVersion = '6.7' -} diff --git a/parser/antlr/lib/antlr-4.9-complete.jar b/parser/antlr/lib/antlr-4.9.2-complete.jar similarity index 82% rename from parser/antlr/lib/antlr-4.9-complete.jar rename to parser/antlr/lib/antlr-4.9.2-complete.jar index c1ca306cc..f68c92666 100644 Binary files a/parser/antlr/lib/antlr-4.9-complete.jar and b/parser/antlr/lib/antlr-4.9.2-complete.jar differ diff --git a/parser/antlr/lib/antlr-runtime-4.9.jar b/parser/antlr/lib/antlr-runtime-4.9.2.jar similarity index 88% rename from parser/antlr/lib/antlr-runtime-4.9.jar rename to parser/antlr/lib/antlr-runtime-4.9.2.jar index c18a4dc4d..ab5a3b447 100644 Binary files a/parser/antlr/lib/antlr-runtime-4.9.jar and b/parser/antlr/lib/antlr-runtime-4.9.2.jar differ diff --git a/parser/build.gradle b/parser/build.gradle index 863215511..c97ce6684 100644 --- a/parser/build.gradle +++ b/parser/build.gradle @@ -10,24 +10,16 @@ repositories { mavenCentral() } - -configurations { - // strange antlr plugin issue, see https://github.com/gradle/gradle/issues/820 - // this avoids linking in the complete antlr binary jar - compile { - extendsFrom = extendsFrom.findAll { it != configurations.antlr } - } -} - dependencies { - antlr 'org.antlr:antlr4:4.9' - implementation 'org.antlr:antlr4-runtime:4.9' - -// antlr('org.antlr:antlr4:4.9') { -// exclude group: 'com.ibm.icu', module: 'icu4j' -// } + antlr 'org.antlr:antlr4:4.9.2' + implementation 'org.antlr:antlr4-runtime:4.9.2' } +configurations.all { + exclude group: 'com.ibm.icu', module: 'icu4j' +} + + compileJava { dependsOn tasks.withType(AntlrTask) } @@ -47,7 +39,3 @@ sourceSets { } } } - -task wrapper(type: Wrapper) { - gradleVersion = '6.7' -}