Update dependencies

camdenorrb · May 25, 2022 · ce4ac35 · ce4ac35
1 parent 666a1c0
commit ce4ac35
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     idea
     application
-    kotlin("jvm") version "1.6.10"
+    kotlin("jvm") version "1.7.0-RC"
 }
 
 group = "dev.twelveoclock.lang"
@@ -18,9 +18,9 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
 
-    implementation("org.capnproto:runtime:0.1.11")
-    implementation("com.guardsquare:proguard-core:8.0.3")
-    implementation("tech.poder.ir:PoderTechIR:+")
+    implementation("org.capnproto:runtime:0.1.13")
+    implementation("com.guardsquare:proguard-core:9.0.0")
+    //implementation("tech.poder.ir:PoderTechIR:+")
     testImplementation(kotlin("test-junit5"))
 }
 
@@ -36,8 +36,8 @@ tasks {
     val javaVersion = JavaVersion.VERSION_17.toString()
 
     withType<KotlinCompile> {
-        sourceCompatibility = javaVersion
-        targetCompatibility = javaVersion
+        //sourceCompatibility = javaVersion
+        //targetCompatibility = javaVersion
         kotlinOptions.jvmTarget = javaVersion
         //kotlinOptions.languageVersion = "1.6"
         //kotlinOptions.apiVersion = "1.6"

diff --git a/goals.md b/goals.md
@@ -0,0 +1 @@
+[] Use same memory for structs if they contain the same values, only use different memory if changed
diff --git 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-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/dev/twelveoclock/lang/crescent/Main.kt b/src/main/kotlin/dev/twelveoclock/lang/crescent/Main.kt
@@ -13,6 +13,7 @@ object Main {
 	// TODO: Replace all checkEquals in project with check and a custom message
 	@JvmStatic
 	fun main(args: Array<String>) {
+
 		for (x in 0..9) {
 			for (y in 0..9) {
 				for (z in 0..9) {

diff --git a/src/main/kotlin/dev/twelveoclock/lang/crescent/translators/CrescentToPTIR.kt b/src/main/kotlin/dev/twelveoclock/lang/crescent/translators/CrescentToPTIR.kt
@@ -1,5 +1,6 @@
 package dev.twelveoclock.lang.crescent.translators
 
+/*
 import dev.twelveoclock.lang.crescent.language.ast.CrescentAST
 import dev.twelveoclock.lang.crescent.language.token.CrescentToken
 import tech.poder.ir.api.CodeFile
@@ -371,4 +372,5 @@ class CrescentToPTIR {
 			else -> error("Unsupported type: $type")
 		}
 	}
-}
+}
+*/
diff --git a/src/test/kotlin/dev/twelveoclock/lang/crescent/data/TestCode.kt b/src/test/kotlin/dev/twelveoclock/lang/crescent/data/TestCode.kt
@@ -297,7 +297,7 @@ internal object TestCode {
 		"""
 			
 	        struct Example(
-                val aNumber: I8          # New lines makes commas redundant
+                val aNumber: I8           # New lines makes commas redundant
                 val aValue1 aValue2 = ""  # Multi declaration of same type, can all be set to one or multiple default values
             )
 			

diff --git a/src/test/kotlin/dev/twelveoclock/lang/crescent/ptir/TranslatorTest.kt b/src/test/kotlin/dev/twelveoclock/lang/crescent/ptir/TranslatorTest.kt
@@ -1,5 +1,5 @@
 package dev.twelveoclock.lang.crescent.ptir
-
+/*
 import dev.twelveoclock.lang.crescent.data.TestCode
 import dev.twelveoclock.lang.crescent.lexers.CrescentLexer
 import dev.twelveoclock.lang.crescent.parsers.CrescentParser
@@ -10,6 +10,7 @@ import java.nio.file.Paths
 import kotlin.io.path.Path
 
 class TranslatorTest {
+
 	@Test
 	fun helloWorld() {
 		val file = CrescentParser.invoke(Path("Test", "example.crescent").toAbsolutePath(), CrescentLexer.invoke(TestCode.helloWorlds))
@@ -45,4 +46,4 @@ class TranslatorTest {
 		println(code.joinToString("\n") { it.asCode().toString() })
 		VirtualMachine.exec(code[0].asCode(), 1u)
 	}*/
-}
+}*/