From 9447537d8c90e22471f81d88f9566b5fd1c1fcf9 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 25 Oct 2018 10:38:34 -0700
Subject: [PATCH] Increment internal Cargo references to
 solana_program_interface

---
 Cargo.toml                            |  2 +-
 programs/bpf/noop_rust/Cargo.toml     |  2 +-
 programs/native/bpf_loader/Cargo.toml |  4 ++--
 programs/native/lua_loader/Cargo.toml |  4 ++--
 programs/native/move_funds/Cargo.toml |  4 ++--
 programs/native/noop/Cargo.toml       |  4 ++--
 scripts/increment-cargo-version.sh    | 15 +++++++++++++--
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1ce056a7f..6c6c0e2e4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ serde_cbor = "0.9.0"
 serde_derive = "1.0.27"
 serde_json = "1.0.10"
 socket2 = "0.3.8"
-solana_program_interface = { path = "common" }
+solana_program_interface = { path = "common", version = "0.10.0" }
 sys-info = "0.5.6"
 tokio = "0.1"
 tokio-codec = "0.1"
diff --git a/programs/bpf/noop_rust/Cargo.toml b/programs/bpf/noop_rust/Cargo.toml
index 686aee365..616da446a 100644
--- a/programs/bpf/noop_rust/Cargo.toml
+++ b/programs/bpf/noop_rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "noop_rust"
-version = "0.1.0"
+version = "0.10.0"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 
 [dependencies]
diff --git a/programs/native/bpf_loader/Cargo.toml b/programs/native/bpf_loader/Cargo.toml
index 1dac73af6..fae401b2b 100644
--- a/programs/native/bpf_loader/Cargo.toml
+++ b/programs/native/bpf_loader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bpf_loader"
-version = "0.1.0"
+version = "0.10.0"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 
 [dependencies]
@@ -13,7 +13,7 @@ log = "0.4.2"
 rbpf = "0.1.0"
 serde = "1.0.27"
 serde_derive = "1.0.27"
-solana_program_interface = { path = "../../../common" }
+solana_program_interface = { path = "../../../common", version = "0.10.0" }
 
 [lib]
 name = "bpf_loader"
diff --git a/programs/native/lua_loader/Cargo.toml b/programs/native/lua_loader/Cargo.toml
index 59cb35dd2..6830d00b9 100644
--- a/programs/native/lua_loader/Cargo.toml
+++ b/programs/native/lua_loader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lua_loader"
-version = "0.1.0"
+version = "0.10.0"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 
 [dependencies]
@@ -10,7 +10,7 @@ log = "0.4.2"
 rlua = "0.15.2"
 serde = "1.0.27"
 serde_derive = "1.0.27"
-solana_program_interface = { path = "../../../common" }
+solana_program_interface = { path = "../../../common", version = "0.10.0" }
 
 [dev-dependencies]
 bincode = "1.0.0"
diff --git a/programs/native/move_funds/Cargo.toml b/programs/native/move_funds/Cargo.toml
index 63400136c..5da0ce61f 100644
--- a/programs/native/move_funds/Cargo.toml
+++ b/programs/native/move_funds/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "move_funds"
-version = "0.1.0"
+version = "0.10.0"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 
 [dependencies]
 bincode = "1.0.0"
 generic-array = { version = "0.12.0", default-features = false, features = ["serde"] }
-solana_program_interface = { path = "../../../common" }
+solana_program_interface = { path = "../../../common", version = "0.10.0" }
 
 [lib]
 name = "move_funds"
diff --git a/programs/native/noop/Cargo.toml b/programs/native/noop/Cargo.toml
index 91910102f..bf9b07486 100644
--- a/programs/native/noop/Cargo.toml
+++ b/programs/native/noop/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "noop"
-version = "0.1.0"
+version = "0.10.0"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 
 [dependencies]
-solana_program_interface = { path = "../../../common" }
+solana_program_interface = { path = "../../../common", version = "0.10.0" }
 
 [lib]
 name = "noop"
diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh
index e32858966..def73cbf1 100755
--- a/scripts/increment-cargo-version.sh
+++ b/scripts/increment-cargo-version.sh
@@ -53,12 +53,23 @@ esac
 
 newVersion="$MAJOR.$MINOR.$PATCH"
 
-for Cargo_toml in {,common/}Cargo.toml; do
+# shellcheck disable=2044 # Disable 'For loops over find output are fragile...'
+for Cargo_toml in $(find . -name Cargo.toml); do
+  # Bump crate version
   (
     set -x
-    sed -i $Cargo_toml -e "s/^version = \"$currentVersion\"$/version = \"$newVersion\"/"
+    sed -i "$Cargo_toml" -e "s/^version = \"[^\"]\"$/version = \"$newVersion\"/"
+  )
+
+  # Fix up the internal references to the solana_program_interface crate
+  (
+    set -x
+    sed -i "$Cargo_toml" -e "
+      s/^solana_program_interface.*\(\"[^\"]*common\"\).*\$/solana_program_interface = \{ path = \1, version = \"$newVersion\" \}/
+    "
   )
 done
+
 echo "$currentVersion -> $newVersion"
 
 exit 0