Merge pull request #120 from pontem-network/1.31.1

1.32.0
pontem-network · Dec 12, 2023 · 1eb75a7 · 1eb75a7
2 parents 8db1f76 + 5f747c9
commit 1eb75a7
Show file tree

Hide file tree

Showing 124 changed files with 1,344 additions and 1,879 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -11,7 +11,7 @@ jobs:
         strategy:
             matrix:
                 os: [ ubuntu-latest ]
-                gradle-properties-version: [ 223, 231, 232 ]
+                gradle-properties-version: [ 231, 232, 233 ]
 
         runs-on: ${{ matrix.os }}
         env:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,33 +9,33 @@ val isCI = System.getenv("CI") != null
 
 fun prop(name: String): String =
     extra.properties[name] as? String
-        ?: error("Property `$name` is not defined in gradle.properties for environment `$platformVersion`")
+        ?: error("Property `$name` is not defined in gradle.properties for environment `$shortPlatformVersion`")
 
-val platformVersion = prop("shortPlatformVersion")
-val codeVersion = "1.31.0"
-val pluginVersion = "$codeVersion.$platformVersion"
+val shortPlatformVersion = prop("shortPlatformVersion")
+val codeVersion = "1.32.0"
+val pluginVersion = "$codeVersion.$shortPlatformVersion"
 val pluginGroup = "org.move"
 val javaVersion = JavaVersion.VERSION_17
-val kotlinStdlibVersion = "1.9.0"
 val pluginJarName = "intellij-move-$pluginVersion"
 
-val aptosVersion = "2.0.3"
+val kotlinReflectVersion = "1.8.10"
+val aptosVersion = "2.3.2"
 
 group = pluginGroup
 version = pluginVersion
 
 plugins {
     id("java")
-    kotlin("jvm") version "1.9.0"
-    id("org.jetbrains.intellij") version "1.15.0"
-    id("org.jetbrains.grammarkit") version "2022.3.1"
+    kotlin("jvm") version "1.9.21"
+    id("org.jetbrains.intellij") version "1.16.1"
+    id("org.jetbrains.grammarkit") version "2022.3.2"
     id("net.saliman.properties") version "1.5.2"
     id("org.gradle.idea")
-    id("de.undercouch.download") version "5.4.0"
+    id("de.undercouch.download") version "5.5.0"
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinStdlibVersion")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinReflectVersion")
 
     implementation("io.sentry:sentry:6.25.0") {
         exclude("org.slf4j")
@@ -87,7 +87,7 @@ allprojects {
     kotlin {
         sourceSets {
             main {
-                kotlin.srcDirs("src/$platformVersion/main/kotlin")
+                kotlin.srcDirs("src/$shortPlatformVersion/main/kotlin")
             }
         }
     }
@@ -111,8 +111,8 @@ allprojects {
         withType<KotlinCompile> {
             kotlinOptions {
                 jvmTarget = "17"
-                languageVersion = "1.8"
-                apiVersion = "1.6"
+                languageVersion = "1.9"
+                apiVersion = "1.8"
                 freeCompilerArgs = listOf("-Xjvm-default=all")
             }
         }
@@ -130,23 +130,23 @@ allprojects {
         task("downloadAptosBinaries") {
             val baseUrl = "https://github.com/aptos-labs/aptos-core/releases/download/aptos-cli-v$aptosVersion"
             doLast {
-                for (releasePlatform in listOf("MacOSX", "Ubuntu-22.04", "Ubuntu", "Windows")) {
+                // NOTE: MacOS is not supported anymore for pre-built CLI
+                for (releasePlatform in listOf(/*"MacOSX",*/ "Ubuntu-22.04", "Ubuntu", "Windows")) {
                     val zipFileName = "aptos-cli-$aptosVersion-$releasePlatform-x86_64.zip"
                     val zipFileUrl = "$baseUrl/$zipFileName"
                     val zipRoot = "${rootProject.buildDir}/zip"
                     val zipFile = file("$zipRoot/$zipFileName")
-                    if (zipFile.exists()) {
-                        continue
-                    }
-                    download.run {
-                        src(zipFileUrl)
-                        dest(zipFile)
-                        overwrite(false)
+                    if (!zipFile.exists()) {
+                        download.run {
+                            src(zipFileUrl)
+                            dest(zipFile)
+                            overwrite(false)
+                        }
                     }
 
                     val platformName =
                         when (releasePlatform) {
-                            "MacOSX" -> "macos"
+//                            "MacOSX" -> "macos"
                             "Ubuntu" -> "ubuntu"
                             "Ubuntu-22.04" -> "ubuntu22"
                             "Windows" -> "windows"
@@ -203,9 +203,12 @@ project(":plugin") {
 
     tasks {
         runPluginVerifier {
-            ideVersions.set(
-                prop("verifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty)
-            )
+            if ("SNAPSHOT" !in shortPlatformVersion) {
+                ideVersions.set(
+                    prop("verifierIdeVersions")
+                        .split(',').map(String::trim).filter(String::isNotEmpty)
+                )
+            }
             failureLevel.set(
                 EnumSet.complementOf(
                     EnumSet.of(

diff --git a/changelog/1.32.0.md b/changelog/1.32.0.md
@@ -0,0 +1,18 @@
+# INTELLIJ MOVE CHANGELOG: 1.32.0
+
+13 Dec 2023
+
+## Fixes
+
+* Remove bundled `aptos-cli` for MacOS.
+
+* Fix endless loop if project is opened in an invalid Aptos root.
+
+* Remove "New Project" functionality in Intellij IDEA, it never worked correctly. 
+
+## Internal
+
+* Add support for 2023.3. 
+
+* Drop 2022.3. 
+
diff --git a/gradle-223.properties → gradle-233.properties b/gradle-223.properties → gradle-233.properties
@@ -1,13 +1,13 @@
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 223
-pluginUntilBuild = 223.*
+pluginSinceBuild = 233
+pluginUntilBuild = 233.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = PC
-platformVersion = 2022.3
+platformVersion = 2023.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins = org.toml.lang
-verifierIdeVersions = PC-2022.3
+verifierIdeVersions = PC-2023.3
diff --git a/gradle.properties b/gradle.properties
@@ -17,6 +17,6 @@ jbrVersion=17.0.7b1000.6
 
 propertiesPluginEnvironmentNameProperty=shortPlatformVersion
 # properties files
-# supported versions are 223, 231, 232, default is 223
+# supported versions are 231, 232, 233, default is 231
 # pass ORG_GRADLE_PROJECT_shortPlatformVersion environment variable to overwrite
-shortPlatformVersion=223
+shortPlatformVersion=231
diff --git a/src/main/grammars/MoveLexer.flex b/src/main/grammars/MoveLexer.flex
@@ -59,9 +59,7 @@ WHITE_SPACE      = {WHITE_SPACE_CHAR}+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Comments
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//EOL_DOC_LINE  = {LINE_WS}*("///".*)
 EOL_DOC_COMMENT =  ("///".*)
-//OUTER_EOL_DOC = ({EOL_DOC_LINE}{EOL_WS})*{EOL_DOC_LINE}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Literals
@@ -76,7 +74,6 @@ INTEGER_LITERAL=[0-9]+[a-zA-Z0-9_]*
 HEX_INTEGER_LITERAL=0x[0-9a-zA-Z_]*
 HEX_STRING_LITERAL=x\" ( [0-9a-zA-Z]* ) (\")?
 BYTE_STRING_LITERAL=b\" ( [^\\\"\n] | \\[^] )* (\")?
-//BYTE_STRING_LITERAL=b\" ( [^\"\n] | (\\\")] )* (\")?
 
 IDENTIFIER=[_a-zA-Z][_a-zA-Z0-9]*