Skip to content

Commit 450ac7e

Browse files
MatthewLMMatthewLM
committed
Update macOS and iOS builds for secp256k1-coinlib
1 parent dfbed10 commit 450ac7e

File tree

14 files changed

+48
-38
lines changed

14 files changed

+48
-38
lines changed

‎coinlib/bin/build_macos.dart‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ void main() async {
99

1010
final tmpDir = createTmpDir();
1111
print("Building in $tmpDir");
12-
final libDir = "$tmpDir/secp256k1";
12+
final libDir = "$tmpDir/secp256k1-coinlib";
1313

1414
exitOnCode(
1515
await execWithStdio(
16-
"git", ["clone", "https://github.com/bitcoin-core/secp256k1", libDir],
16+
"git", ["clone", "https://github.com/peercoin/secp256k1-coinlib", libDir],
1717
),
18-
"Could not clone secp256k1 to temporary build directory",
18+
"Could not clone secp256k1-coinlib to temporary build directory",
1919
);
2020

21-
// Checkout to 0.5.0 commit
21+
// Checkout to 0.7.0 commit
2222
exitOnCode(
2323
await execWithStdio(
24-
"git", ["checkout", "e3a885d42a7800c1ccebad94ad1e2b82c4df5c65"],
24+
"git", ["checkout", "69018e5b939d8d540ca6b237945100f4ecb5681e"],
2525
workingDir: libDir,
2626
),
27-
"Could not checkout to v0.5.0 commit",
27+
"Could not checkout to v0.7.0 commit",
2828
);
2929

30-
// Generate configure
30+
// Generate configure. Do not move to cmake on macOS yet
3131
exitCode = await execWithStdio("sh", ["./autogen.sh"], workingDir: libDir);
3232
if (exitCode != 0) {
33-
print("Couldn't generate configure for secp256k1");
33+
print("Couldn't generate configure for secp256k1-coinlib");
3434
exit(1);
3535
}
3636

@@ -48,14 +48,14 @@ void main() async {
4848
workingDir: libDir,
4949
);
5050
if (exitCode != 0) {
51-
print("Failed to configure secp256k1");
51+
print("Failed to configure secp256k1-coinlib");
5252
exit(1);
5353
}
5454

5555
// Run make
5656
exitCode = await execWithStdio("make", [], workingDir: libDir);
5757
if (exitCode != 0) {
58-
print("Failed to make secp256k1");
58+
print("Failed to make secp256k1-coinlib");
5959
exit(1);
6060
}
6161

@@ -69,7 +69,7 @@ void main() async {
6969
// Copy framework to build directory
7070
final buildDir = "${Directory.current.path}/build";
7171
Directory(buildDir).create();
72-
final libFile = File("$libDir/build/lib/libsecp256k1.2.dylib");
72+
final libFile = File("$libDir/build/lib/libsecp256k1.6.dylib");
7373
await libFile.copy("$buildDir/libsecp256k1.dylib");
7474
print("Created dylib in build directory");
7575

‎coinlib_flutter/darwin/coinlib_flutter.podspec‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Clone secp256k1 0.5.0 code into ./build/secp256k1
1+
# Clone secp256k1-coinlib 0.7.0 code into ./build/secp256k1-coinlib
22
`
33
mkdir build
4-
git clone https://github.com/bitcoin-core/secp256k1 build/secp256k1
5-
cd build/secp256k1
6-
git checkout e3a885d42a7800c1ccebad94ad1e2b82c4df5c65
4+
git clone https://github.com/peercoin/secp256k1-coinlib build/secp256k1-coinlib
5+
cd build/secp256k1-coinlib
6+
git checkout 69018e5b939d8d540ca6b237945100f4ecb5681e
77
`
88

99
Pod::Spec.new do |s|
1010
s.name = 'coinlib_flutter'
1111
s.module_name = 'secp256k1'
12-
s.version = '0.5.0'
12+
s.version = '0.7.0'
1313
s.summary = 'Cryptographic primitives from the secp256k1 library'
1414
s.description = <<-DESC
15-
The secp256k1 library bundled into the flutter plugin via cocoapods.
15+
The secp256k1-coinlib library bundled into the flutter plugin via cocoapods.
1616
DESC
1717
s.homepage = 'http://peercoin.net'
1818
s.license = { :file => '../LICENSE' }

‎coinlib_flutter/example/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

‎coinlib_flutter/example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

‎coinlib_flutter/example/ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
2+
# platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎coinlib_flutter/example/ios/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- coinlib_flutter (0.3.2):
2+
- coinlib_flutter (0.7.0):
33
- Flutter
44
- FlutterMacOS
55
- Flutter (1.0.0)
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
1515
:path: Flutter
1616

1717
SPEC CHECKSUMS:
18-
coinlib_flutter: 6abec900d67762a6e7ccfd567a3cd3ae00bbee35
19-
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
18+
coinlib_flutter: 7e6fd630b97a00f4bef09abfd6683be2b6d31b36
19+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
2020

21-
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
21+
PODFILE CHECKSUM: 0dbd5a87e0ace00c9610d2037ac22083a01f861d
2222

23-
COCOAPODS: 1.15.2
23+
COCOAPODS: 1.16.2

‎coinlib_flutter/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
343343
GCC_WARN_UNUSED_FUNCTION = YES;
344344
GCC_WARN_UNUSED_VARIABLE = YES;
345-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
345+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
346346
MTL_ENABLE_DEBUG_INFO = NO;
347347
SDKROOT = iphoneos;
348348
SUPPORTED_PLATFORMS = iphoneos;
@@ -420,7 +420,7 @@
420420
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
421421
GCC_WARN_UNUSED_FUNCTION = YES;
422422
GCC_WARN_UNUSED_VARIABLE = YES;
423-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
423+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
424424
MTL_ENABLE_DEBUG_INFO = YES;
425425
ONLY_ACTIVE_ARCH = YES;
426426
SDKROOT = iphoneos;
@@ -469,7 +469,7 @@
469469
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
470470
GCC_WARN_UNUSED_FUNCTION = YES;
471471
GCC_WARN_UNUSED_VARIABLE = YES;
472-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
472+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
473473
MTL_ENABLE_DEBUG_INFO = NO;
474474
SDKROOT = iphoneos;
475475
SUPPORTED_PLATFORMS = iphoneos;

‎coinlib_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -43,11 +44,13 @@
4344
buildConfiguration = "Debug"
4445
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4546
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4648
launchStyle = "0"
4749
useCustomWorkingDirectory = "NO"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
5052
debugServiceExtension = "internal"
53+
enableGPUValidationMode = "1"
5154
allowLocationSimulation = "YES">
5255
<BuildableProductRunnable
5356
runnableDebuggingMode = "0">

‎coinlib_flutter/example/ios/Runner/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎coinlib_flutter/example/macos/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.14'
1+
platform :osx, '10.15'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

0 commit comments

Comments
 (0)