Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump go to 1.20 and update patches #18564

Closed
wants to merge 4 commits into from
Closed

chore: bump go to 1.20 and update patches #18564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e5b33b
chore: bump go to 20 and update patch
siddarthkay Jan 14, 2024
628217b
point status-go to upgrade branch
siddarthkay Jan 18, 2024
f71dd92
fix: undefined symbol while linking
siddarthkay Jan 20, 2024
a86d815
chore: use `netgo` for both android & iOS
siddarthkay Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions ios/StatusIm.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -795,7 +795,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm";
};
name = Debug;
Expand Down Expand Up @@ -828,7 +828,7 @@
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm";
};
name = Release;
Expand Down Expand Up @@ -899,14 +899,15 @@
"$(inherited)",
"-lc++",
"-ObjC",
"-lresolv",
);
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
DEAD_CODE_STRIPPING = YES;
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
PRODUCT_NAME = StatusIm;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
TARGETED_DEVICE_FAMILY = 1;
VALID_ARCHS = "x86_64 arm64";
"VALID_ARCHS[sdk=iphonesimulator*]" = "x86_64 ";
Expand Down Expand Up @@ -973,14 +974,15 @@
"$(inherited)",
"-lc++",
"-ObjC",
"-lresolv",
);
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
DEAD_CODE_STRIPPING = YES;
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
PRODUCT_NAME = StatusIm;
PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1";
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum";
SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
TARGETED_DEVICE_FAMILY = 1;
VALID_ARCHS = arm64;
};
Expand Down Expand Up @@ -1051,13 +1053,14 @@
"$(inherited)",
"-lc++",
"-ObjC",
"-lresolv",
);
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
PRODUCT_NAME = "Status PR";
PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr";
SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
TARGETED_DEVICE_FAMILY = 1;
VALID_ARCHS = arm64;
};
Expand Down Expand Up @@ -1122,12 +1125,13 @@
"$(inherited)",
"-lc++",
"-ObjC",
"-lresolv",
);
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
PRODUCT_NAME = "Status PR";
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr";
SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
TARGETED_DEVICE_FAMILY = 1;
VALID_ARCHS = arm64;
};
Expand Down Expand Up @@ -1216,7 +1220,7 @@
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
);
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
DEAD_CODE_STRIPPING = YES;
SDKROOT = iphoneos;
VALID_ARCHS = arm64;
"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
Expand Down Expand Up @@ -1297,7 +1301,7 @@
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
);
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
DEAD_CODE_STRIPPING = YES;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = arm64;
Expand Down
20 changes: 13 additions & 7 deletions nix/overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,21 @@ in {
version = "15.0";
allowHigher = true;
};
go = super.go_1_19;
go = super.go_1_20;
clang = super.clang_15;
buildGoPackage = super.buildGo119Package;
buildGoModule = super.buildGo119Module;
buildGoPackage = super.buildGo120Package;
buildGoModule = super.buildGo120Module;
gomobile = (super.gomobile.overrideAttrs (old: {
patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
};
patches = [
(self.fetchurl { # https://github.com/golang/mobile/pull/84
url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
})
(self.fetchurl { # https://github.com/golang/go/issues/58426
url = "https://github.com/golang/mobile/commit/406ed3a7b8e44dc32844953647b49696d8847d51.patch";
sha256 = "sha256-dqbYukHkQEw8npOkKykOAzMC3ot/Y4DEuh7fE+ptlr8=";
})
];
})).override {
# FIXME: No Android SDK packages for aarch64-darwin.
withAndroidPkgs = stdenv.system != "aarch64-darwin";
Expand Down
2 changes: 1 addition & 1 deletion nix/status-go/mobile/build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ in buildGoPackage {
-target=${concatStringsSep "," targets} \
${optionalString isAndroid "-androidapi=${platformVersion}" } \
${optionalString isIOS "-iosversion=${platformVersion}" } \
-tags='${optionalString isIOS "nowatchdog"} gowaku_skip_migrations gowaku_no_rln' \
-tags='${optionalString isIOS "nowatchdog"} gowaku_skip_migrations gowaku_no_rln netgo' \
-o ${outputFileName} \
${source.goPackagePath}/mobile

Expand Down
6 changes: 3 additions & 3 deletions status-go-version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im",
"repo": "status-go",
"version": "v0.172.8",
"commit-sha1": "436d22985661322ffda4eb44c1a160e6804f3823",
"src-sha256": "1y3l469k2085qaml7dmaky1rlanl4phq2p6yyk97074yw839jzj1"
"version": "bump-go-waku-and-golang",
"commit-sha1": "0c79a2209268edbedee8cda78902727b38b52c8e",
"src-sha256": "1nc0x4fl7ka63ig1c95pfs017flmw7iffb13q7vz1p03cibq7cff"
}