diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 8fa75fe1c..bb6f78f10 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -4,6 +4,6 @@ <option name="jvmTarget" value="11" /> </component> <component name="KotlinJpsPluginSettings"> - <option name="version" value="1.9.20" /> + <option name="version" value="1.9.24" /> </component> -</project> \ No newline at end of file +</project> diff --git a/.idea/misc.xml b/.idea/misc.xml index 209ccd3b7..e24ec7891 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,7 +22,7 @@ <component name="FrameworkDetectionExcludesConfiguration"> <type id="Python" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="openjdk-11" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project> \ No newline at end of file diff --git a/codeCore/build.gradle b/codeCore/build.gradle index a98eda6c3..cf12e5952 100644 --- a/codeCore/build.gradle +++ b/codeCore/build.gradle @@ -6,9 +6,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/codeGenCpu6502/build.gradle b/codeGenCpu6502/build.gradle index 59842ef68..8981ccaf4 100644 --- a/codeGenCpu6502/build.gradle +++ b/codeGenCpu6502/build.gradle @@ -5,9 +5,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/codeGenExperimental/build.gradle b/codeGenExperimental/build.gradle index 51d257288..8906282b1 100644 --- a/codeGenExperimental/build.gradle +++ b/codeGenExperimental/build.gradle @@ -6,9 +6,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/codeGenIntermediate/build.gradle b/codeGenIntermediate/build.gradle index 659e060e9..1b3a2b562 100644 --- a/codeGenIntermediate/build.gradle +++ b/codeGenIntermediate/build.gradle @@ -6,9 +6,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/codeOptimizers/build.gradle b/codeOptimizers/build.gradle index cbc4ac70a..4e4f73dff 100644 --- a/codeOptimizers/build.gradle +++ b/codeOptimizers/build.gradle @@ -6,9 +6,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/compiler/build.gradle b/compiler/build.gradle index 5da5a11ed..df0b50b0a 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -7,9 +7,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/compilerAst/build.gradle b/compilerAst/build.gradle index fdb525938..516889108 100644 --- a/compilerAst/build.gradle +++ b/compilerAst/build.gradle @@ -4,9 +4,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/docs/docs.iml b/docs/docs.iml index 9f467ff8c..5d2af37ce 100644 --- a/docs/docs.iml +++ b/docs/docs.iml @@ -5,7 +5,7 @@ <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/build" /> </content> - <orderEntry type="jdk" jdkName="Python 3.11" jdkType="Python SDK" /> + <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module> \ No newline at end of file diff --git a/examples/test.p8 b/examples/test.p8 index 4080979a8..ba4cd7983 100644 --- a/examples/test.p8 +++ b/examples/test.p8 @@ -2,6 +2,8 @@ main { sub start() { - void = call($2000) + repeat cx16.r0 { + cx16.r1L++ + } } } diff --git a/intermediate/build.gradle b/intermediate/build.gradle index d0a7bfe40..a868a7118 100644 --- a/intermediate/build.gradle +++ b/intermediate/build.gradle @@ -6,9 +6,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin { diff --git a/parser/build.gradle b/parser/build.gradle index 26bf8093d..adbd6d1a9 100644 --- a/parser/build.gradle +++ b/parser/build.gradle @@ -4,9 +4,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } dependencies { diff --git a/virtualmachine/build.gradle b/virtualmachine/build.gradle index 2e93cb06b..fbe142e3c 100644 --- a/virtualmachine/build.gradle +++ b/virtualmachine/build.gradle @@ -6,9 +6,8 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(javaVersion) - } + targetCompatibility = JavaLanguageVersion.of(javaVersion) + sourceCompatibility = JavaLanguageVersion.of(javaVersion) } compileKotlin {