mirror of
https://github.com/irmen/prog8.git
synced 2024-10-18 16:24:26 +00:00
Merge remote-tracking branch 'remotes/origin/master' into issue40(EOF,EOL)
This commit is contained in:
commit
eddad20acc
@ -1,7 +1,7 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="antlr-4.9-complete">
|
<library name="antlr-4.9-complete">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-4.9-complete.jar!/" />
|
<root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-4.9.2-complete.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="antlr-runtime-4.9">
|
<library name="antlr-runtime-4.9">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-runtime-4.9.jar!/" />
|
<root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-runtime-4.9.2.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="kotlinx-cli-jvm">
|
<library name="kotlinx-cli-jvm">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/compiler/lib/kotlinx-cli-jvm-0.3.1.jar!/" />
|
<root url="jar://$PROJECT_DIR$/compiler/lib/kotlinx-cli-jvm-0.3.2.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
3
build.gradle
Normal file
3
build.gradle
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.jvm" version "1.5.10" apply false
|
||||||
|
}
|
@ -1,13 +1,14 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'application'
|
id 'application'
|
||||||
id "org.jetbrains.kotlin.jvm" version "1.5.10"
|
id "org.jetbrains.kotlin.jvm"
|
||||||
id 'com.github.johnrengelman.shadow' version '6.1.0'
|
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
targetCompatibility = 11
|
targetCompatibility = 11
|
||||||
sourceCompatibility = 11
|
sourceCompatibility = 11
|
||||||
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
@ -21,8 +22,6 @@ dependencies {
|
|||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
|
||||||
// implementation "org.jetbrains.kotlin:kotlin-reflect"
|
// implementation "org.jetbrains.kotlin:kotlin-reflect"
|
||||||
implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.2'
|
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.jetbrains.kotlin:kotlin-test-junit5"
|
||||||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
|
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'
|
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 {
|
compileKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "11"
|
jvmTarget = "11"
|
||||||
@ -66,7 +79,6 @@ startScripts.enabled = true
|
|||||||
|
|
||||||
application {
|
application {
|
||||||
mainClass = 'prog8.CompilerMainKt'
|
mainClass = 'prog8.CompilerMainKt'
|
||||||
mainClassName = 'prog8.CompilerMainKt' // deprecated
|
|
||||||
applicationName = 'p8compile'
|
applicationName = 'p8compile'
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,8 +106,3 @@ test {
|
|||||||
events "skipped", "failed"
|
events "skipped", "failed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
|
||||||
gradleVersion = '6.7'
|
|
||||||
}
|
|
||||||
|
Binary file not shown.
BIN
compiler/lib/kotlinx-cli-jvm-0.3.2.jar
Normal file
BIN
compiler/lib/kotlinx-cli-jvm-0.3.2.jar
Normal file
Binary file not shown.
@ -1,7 +1,6 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'antlr'
|
|
||||||
id 'java'
|
id 'java'
|
||||||
id "org.jetbrains.kotlin.jvm" version "1.5.10"
|
id "org.jetbrains.kotlin.jvm"
|
||||||
}
|
}
|
||||||
|
|
||||||
targetCompatibility = 11
|
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 {
|
dependencies {
|
||||||
antlr 'org.antlr:antlr4:4.9'
|
implementation 'org.antlr:antlr4-runtime:4.9.2'
|
||||||
implementation 'org.antlr:antlr4-runtime:4.9'
|
|
||||||
implementation project(':parser')
|
implementation project(':parser')
|
||||||
|
|
||||||
testImplementation "org.jetbrains.kotlin:kotlin-test-junit5"
|
testImplementation "org.jetbrains.kotlin:kotlin-test-junit5"
|
||||||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
|
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
|
||||||
testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0'
|
testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0'
|
||||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
|
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
|
||||||
|
}
|
||||||
|
|
||||||
// antlr('org.antlr:antlr4:4.9') {
|
configurations.all {
|
||||||
// exclude group: 'com.ibm.icu', module: 'icu4j'
|
exclude group: 'com.ibm.icu', module: 'icu4j'
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
@ -79,7 +69,3 @@ test {
|
|||||||
events "skipped", "failed"
|
events "skipped", "failed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
|
||||||
gradleVersion = '6.7'
|
|
||||||
}
|
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'application'
|
id 'application'
|
||||||
id "org.jetbrains.kotlin.jvm" version "1.5.10"
|
id "org.jetbrains.kotlin.jvm"
|
||||||
id 'com.github.johnrengelman.shadow' version '6.1.0'
|
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
targetCompatibility = 11
|
targetCompatibility = 11
|
||||||
@ -28,6 +28,11 @@ dependencies {
|
|||||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
|
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 {
|
compileKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "11"
|
jvmTarget = "11"
|
||||||
@ -62,8 +67,7 @@ startScripts.enabled = true
|
|||||||
|
|
||||||
application {
|
application {
|
||||||
mainClass = 'prog8.dbus.TestdbusKt'
|
mainClass = 'prog8.dbus.TestdbusKt'
|
||||||
mainClassName = 'prog8.dbus.TestdbusKt' // deprecated
|
applicationName = 'prog8compilerservicedbus'
|
||||||
applicationName = 'testdbus'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
@ -90,7 +94,3 @@ test {
|
|||||||
events "skipped", "failed"
|
events "skipped", "failed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
|
||||||
gradleVersion = '6.7'
|
|
||||||
}
|
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
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
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
21
gradlew.bat
vendored
21
gradlew.bat
vendored
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto init
|
if "%ERRORLEVEL%" == "0" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
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_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto init
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
@ -64,21 +64,6 @@ echo location of your Java installation.
|
|||||||
|
|
||||||
goto fail
|
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
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@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
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'application'
|
id 'application'
|
||||||
id "org.jetbrains.kotlin.jvm" version "1.5.10"
|
id "org.jetbrains.kotlin.jvm"
|
||||||
id 'com.github.johnrengelman.shadow' version '6.1.0'
|
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
targetCompatibility = 11
|
targetCompatibility = 11
|
||||||
@ -31,6 +31,12 @@ dependencies {
|
|||||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
|
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 {
|
compileKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "11"
|
jvmTarget = "11"
|
||||||
@ -65,8 +71,7 @@ startScripts.enabled = true
|
|||||||
|
|
||||||
application {
|
application {
|
||||||
mainClass = 'prog8.http.TestHttpKt'
|
mainClass = 'prog8.http.TestHttpKt'
|
||||||
mainClassName = 'prog8.http.TestHttpKt' // deprecated
|
applicationName = 'prog8compilerservicehttp'
|
||||||
applicationName = 'testhttp'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
@ -93,7 +98,3 @@ test {
|
|||||||
events "skipped", "failed"
|
events "skipped", "failed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
|
||||||
gradleVersion = '6.7'
|
|
||||||
}
|
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -10,24 +10,16 @@ repositories {
|
|||||||
mavenCentral()
|
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 {
|
dependencies {
|
||||||
antlr 'org.antlr:antlr4:4.9'
|
antlr 'org.antlr:antlr4:4.9.2'
|
||||||
implementation 'org.antlr:antlr4-runtime:4.9'
|
implementation 'org.antlr:antlr4-runtime:4.9.2'
|
||||||
|
|
||||||
// antlr('org.antlr:antlr4:4.9') {
|
|
||||||
// exclude group: 'com.ibm.icu', module: 'icu4j'
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configurations.all {
|
||||||
|
exclude group: 'com.ibm.icu', module: 'icu4j'
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
compileJava {
|
compileJava {
|
||||||
dependsOn tasks.withType(AntlrTask)
|
dependsOn tasks.withType(AntlrTask)
|
||||||
}
|
}
|
||||||
@ -47,7 +39,3 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
|
||||||
gradleVersion = '6.7'
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user