Remove Cadence 1.0 Migration Features (#685)

onflow · Sep 17, 2024 · 42bd63d · 42bd63d
1 parent 8763dd6
commit 42bd63d
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 41 deletions.
diff --git a/.metadata/notifications.json b/.metadata/notifications.json
@@ -1,15 +1 @@
-[
-  {
-    "_type": "Notification",
-    "id": "1",
-    "type": "info",
-    "text": "Cadence 1.0 pre-release builds are now available!  Developers should begin upgrading their projects - see the Cadence 1.0 Migration Guide for more details.",
-    "buttons": [
-      {
-        "label": "Learn More",
-        "link": "https://cadence-lang.org/docs/cadence_migration_guide"
-      }
-    ],
-    "suppressable": false
-  }
-]
+[]
diff --git a/extension/index.d.ts b/extension/index.d.ts
@@ -1,4 +1,3 @@
-declare module '@onflow/decode'
 declare module 'portscanner-sync'
 declare module 'elliptic'
 declare module 'node-fetch'
diff --git a/extension/src/dependency-installer/installers/flow-cli-installer.ts b/extension/src/dependency-installer/installers/flow-cli-installer.ts
@@ -16,7 +16,7 @@ interface HomebrewVersionInfo {
 }
 
 // Command to check flow-cli
-const COMPATIBLE_FLOW_CLI_VERSIONS = '>=1.6.0'
+const COMPATIBLE_FLOW_CLI_VERSIONS = '>=2.0.0'
 
 // Shell install commands
 const BREW_INSTALL_FLOW_CLI = 'brew update && brew install flow-cli'

diff --git a/extension/src/flow-cli/cli-versions-provider.ts b/extension/src/flow-cli/cli-versions-provider.ts
@@ -9,7 +9,6 @@ const CHECK_FLOW_CLI_CMD_NO_JSON = (flowCommand: string): string => `${flowComma
 
 export enum KNOWN_FLOW_COMMANDS {
   DEFAULT = 'flow',
-  CADENCE_V1 = 'flow-c1',
 }
 
 // Matches the version number from the output of the Flow CLI

diff --git a/extension/test/fixtures/workspace/Error.cdc b/extension/test/fixtures/workspace/Error.cdc
@@ -1,9 +1,9 @@
 /**
 Careful: this cadence code is purposely written with errors so we can test error marking
  */
-pub contract interface Foo {
+access(all) contract interface Foo {
 
-    pub var bar: UInt6
+    access(all) var bar: UInt6
 
     fun zoo() {
         return 2

diff --git a/extension/test/fixtures/workspace/FooContract.cdc b/extension/test/fixtures/workspace/FooContract.cdc
@@ -1,2 +1,2 @@
-pub contract FooContract {}
+access(all) contract FooContract {}
 
diff --git a/extension/test/fixtures/workspace/Script.cdc b/extension/test/fixtures/workspace/Script.cdc
@@ -1,4 +1,4 @@
-pub fun main(): UFix64 {
+access(all) fun main(): UFix64 {
     return 42.0
 }
 
diff --git a/extension/test/fixtures/workspace/Tx.cdc b/extension/test/fixtures/workspace/Tx.cdc
@@ -1,7 +1,7 @@
 transaction() {
     let guest: Address
 
-    prepare(authorizer: AuthAccount) {
+    prepare(authorizer: &Account) {
         self.guest = authorizer.address
     }
 

diff --git a/extension/test/fixtures/workspace/test/bar/test2.cdc b/extension/test/fixtures/workspace/test/bar/test2.cdc
@@ -1,9 +1,9 @@
 import Test
 
-pub fun testPassing() {
+access(all) fun testPassing() {
   Test.assert(true)
 }
 
-pub fun testFailing() {
+access(all) fun testFailing() {
   Test.assert(false)
 }
diff --git a/extension/test/fixtures/workspace/test/bar/test3.cdc b/extension/test/fixtures/workspace/test/bar/test3.cdc
@@ -1,9 +1,9 @@
 import Test
 
-pub fun testFailing() {
+access(all) fun testFailing() {
   Test.assert(false)
 }
 
-pub fun testPassing() {
+access(all) fun testPassing() {
   Test.assert(true)
 }
diff --git a/extension/test/fixtures/workspace/test/test1.cdc b/extension/test/fixtures/workspace/test/test1.cdc
@@ -1,5 +1,5 @@
 import Test
 
-pub fun testPassing() {
+access(all) fun testPassing() {
   Test.assert(true)
 }
diff --git a/extension/test/integration/6 - test-provider.test.ts b/extension/test/integration/6 - test-provider.test.ts
@@ -123,7 +123,7 @@ suite('test provider tests', () => {
     const testFilePath = path.join(workspacePath, 'test/bar/test4.cdc')
     const testFileContents = `
       import Test
-      pub fun testPassing() {
+      access(all) fun testPassing() {
         Test.assert(true)
       }
     `

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -212,8 +212,7 @@
 		"typescript": "~5.1.6"
 	},
 	"dependencies": {
-		"@onflow/cadence-parser": "^0.42.1",
-		"@onflow/decode": "0.0.11",
+		"@onflow/cadence-parser": "^1.0.0-preview.50",
 		"@sentry/node": "^8.19.0",
 		"@vscode/vsce": "^2.31.1",
 		"ansi-regex": "^6.0.1",
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		pub contract FooContract {}
		access(all) contract FooContract {}