VP-94 Fix build scripts (#569)

Update SDK version to 1.45.1 Use the latest Rust version (1.76.0) Pass targets to build scripts
everx-labs · Feb 22, 2024 · 04d946e · 04d946e
1 parent 4eb5631
commit 04d946e
Show file tree

Hide file tree

Showing 21 changed files with 60 additions and 39 deletions.
diff --git a/build/src/lib.rs b/build/src/lib.rs
@@ -97,6 +97,10 @@ impl Build {
         }
     }
 
+    pub fn set_platform(&mut self, platform: &str) {
+        self.platform = platform.into();
+    }
+
     pub fn read_lib_file(&self, path: &str) -> String {
         fs::read_to_string(self.package_dir.join("lib").join(path)).unwrap()
     }

diff --git a/lerna.json b/lerna.json
@@ -3,7 +3,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.45.0",
+  "version": "1.45.1",
   "command": {
     "version": {
       "message": "Release"

diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eversdk/cli",
-  "version": "1.45.0",
+  "version": "1.45.1",
   "description": "Evercloud CLI",
   "homepage": "https://everx.dev/",
   "repository": {
@@ -53,8 +53,8 @@
   ],
   "dependencies": {
     "@eversdk/appkit": "^0.3.8",
-    "@eversdk/core": "^1.45.0",
-    "@eversdk/lib-node": "^1.45.0",
+    "@eversdk/core": "^1.45.1",
+    "@eversdk/lib-node": "^1.45.1",
     "commander": "^10.0.0",
     "dotenv": "^16.0.3",
     "everdev": "^1.7.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@eversdk/core",
-	"version": "1.45.0",
+	"version": "1.45.1",
 	"description": "TON Client for Java Script",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
@@ -1 +1 @@
-export const packageVersion = "1.45.0";
+export const packageVersion = "1.45.1";
diff --git a/packages/lib-node/build/src/main.rs b/packages/lib-node/build/src/main.rs
@@ -12,20 +12,36 @@
  *
  */
 
-use ton_client_build::{exec, Build};
+ use std::env;
+ use ton_client_build::{exec, check_targets, Build};
 
 fn main() {
-    let builder = Build::new();
-    assert!(exec("cargo", &["build", "--release"]).success());
-
+    let mut build_args: Vec<&str> = vec!["build", "--release"];
+    let target = env::args().nth(1).unwrap_or("".to_string());
+    let rust_target: &str = match target.as_str() {
+        "arm64-darwin" => "aarch64-apple-darwin",
+        "x64-darwin" => "x86_64-apple-darwin",
+        _ => ""
+    };
+    let mut builder = Build::new();
+    if !rust_target.is_empty() {
+        build_args.append(&mut vec!["--target", rust_target]);
+        check_targets(&vec![rust_target]);
+        builder.set_platform(target.as_str());
+    }
+    assert!(exec("cargo", &build_args).success());
     #[cfg(target_os = "windows")]
     let (lib, gyp, gyp_args) = ("eversdk.lib", "cmd", ["/c", "node-gyp", "rebuild"]);
     #[cfg(not(target_os = "windows"))]
     let (lib, gyp, gyp_args) = ("libeversdk.a", "npm", ["run", "build"]);
-
+    
     builder.add_package_file(
         &format!("lib/{}", lib),
-        builder.target_dir.join("release").join(lib),
+        if !rust_target.is_empty() {
+            builder.target_dir.join(rust_target).join("release").join(lib)
+        } else {
+            builder.target_dir.join("release").join(lib)
+        }
     );
 
     assert!(exec(gyp, &gyp_args).success());

diff --git a/packages/lib-node/lib/Cargo.toml b/packages/lib-node/lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'ever_sdk_node_addon'
-version = '1.44.0'
+version = '1.45.1'
 authors = [ 'TON Labs' ]
 license = 'Apache-2.0'
 
@@ -10,7 +10,7 @@ crate-type = [ 'staticlib' ]
 
 [dependencies]
 libc = '0.2'
-ton_client = { git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.0', default-features = false, features = [ 'std', 'rustls-tls-webpki-roots' ] }
+ton_client = { git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.1', default-features = false, features = [ 'std', 'rustls-tls-webpki-roots' ] }
 
 [profile.release]
 lto = true
diff --git a/packages/lib-node/package.json b/packages/lib-node/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@eversdk/lib-node",
-	"version": "1.45.0",
+	"version": "1.45.1",
 	"description": "TON Client NodeJs AddOn",
 	"repository": {
 		"type": "git",

diff --git a/packages/lib-react-native-jsi/package.json b/packages/lib-react-native-jsi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eversdk/lib-react-native-jsi",
-  "version": "1.45.0",
+  "version": "1.45.1",
   "description": "TON Client React Native JSI Module",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/packages/lib-react-native/android/build/src/main.rs b/packages/lib-react-native/android/build/src/main.rs
@@ -46,7 +46,7 @@ const ARCHS: [Arch; 4] = [
 ];
 
 const LIB: &str = "libeversdk.so";
-const NDK_URL: &str = "http://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip";
+const NDK_URL: &str = "http://dl.google.com/android/repository/android-ndk-r26c-linux.zip";
 
 fn main() {
     let target_arg = env::args().nth(1).unwrap_or("".to_string());
@@ -63,7 +63,7 @@ fn main() {
             &builder.lib_dir.join("NDK").join(arch.ndk).join("bin"),
         ));
         std::env::set_var("PATH", path);
-        assert!(exec("cargo", &["+1.67.0-x86_64-unknown-linux-gnu", "build", "--target", arch.target, "--release"]).success());
+        assert!(exec("cargo", &["build", "--target", arch.target, "--release"]).success());
     }
 
     let out_dir = builder.package_dir.join("src/main/jniLibs");

diff --git a/packages/lib-react-native/android/lib/Cargo.toml b/packages/lib-react-native/android/lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'ever_sdk_react_native_android'
-version = '1.41.0'
+version = '1.45.1'
 authors = [ 'TON Labs' ]
 license = 'Apache-2.0'
 
@@ -9,9 +9,10 @@ name = 'eversdk'
 crate-type = [ 'cdylib' ]
 
 [dependencies]
+openssl-sys = { version = "0.9.97", features = [ "vendored" ] }
 lazy_static = '1.4.0'
 jni = { default-features = false, version = '0.12.0' }
-ton_client = { git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.0' }
+ton_client = { git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.1' }
 
 [profile.release]
 lto = true
diff --git a/packages/lib-react-native/ios/lib/Cargo.toml b/packages/lib-react-native/ios/lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'ever_sdk_react_native_ios'
-version = '1.41.0'
+version = '1.45.1'
 authors = [ 'TON Labs' ]
 license = 'Apache-2.0'
 
@@ -10,7 +10,7 @@ crate-type = [ 'staticlib' ]
 
 [dependencies]
 libc = '0.2'
-ton_client = { git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.0', default-features = false, features = [ 'std', 'rustls-tls-webpki-roots' ] }
+ton_client = { git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.1', default-features = false, features = [ 'std', 'rustls-tls-webpki-roots' ] }
 
 [profile.release]
 lto = true
diff --git a/packages/lib-react-native/package.json b/packages/lib-react-native/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@eversdk/lib-react-native",
-	"version": "1.45.0",
+	"version": "1.45.1",
 	"description": "TON Client React Native Module",
 	"main": "index.js",
 	"repository": {

diff --git a/packages/lib-web/lib/Cargo.toml b/packages/lib-web/lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'ever_sdk_wasm_module'
-version = '1.41.0'
+version = '1.45.1'
 edition = '2018'
 description = 'TON Client WASM binding'
 license = 'Apache-2.0'
@@ -28,7 +28,7 @@ lazy_static = '1.4.0'
 # just to fix building of rand for WASM:
 getrandom = { default-features = false, features = [ 'js' ], version = '0.2.2' }
 
-ton_client = { default-features = false, features = [ 'wasm' ], git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.0' }
+ton_client = { default-features = false, features = [ 'wasm' ], git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.45.1' }
 
 [dependencies.web-sys]
 version = '0.3.57'

diff --git a/packages/lib-web/package.json b/packages/lib-web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@eversdk/lib-web",
-	"version": "1.45.0",
+	"version": "1.45.1",
 	"description": "TON Client WASM module for browsers",
 	"main": "index.js",
 	"repository": {

diff --git a/packages/tests-node/package.json b/packages/tests-node/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@eversdk/tests-node",
-	"version": "1.45.0",
+	"version": "1.45.1",
 	"private": true,
 	"description": "TON Client Tests runner on NodeJs",
 	"main": "index.js",

diff --git a/packages/tests-react-native-jsi/package.json b/packages/tests-react-native-jsi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eversdk/tests-react-native-jsi",
-  "version": "1.45.0",
+  "version": "1.45.1",
   "private": true,
   "main": "index.js",
   "browser": true,

diff --git a/packages/tests-react-native/package.json b/packages/tests-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eversdk/tests-react-native",
-  "version": "1.45.0",
+  "version": "1.45.1",
   "private": true,
   "main": "index.js",
   "browser": true,

diff --git a/packages/tests-web/package.json b/packages/tests-web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@eversdk/tests-web",
-	"version": "1.45.0",
+	"version": "1.45.1",
 	"private": true,
 	"description": "TON Client WASM module tests runner",
 	"scripts": {

diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eversdk/tests",
-  "version": "1.45.0",
+  "version": "1.45.1",
   "private": true,
   "description": "TON Client Tests",
   "main": "dist/index.js",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const packageVersion = "1.45.0";
		export const packageVersion = "1.45.1";