summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2020-08-02 01:48:32 -0400
committerJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2020-08-02 01:57:39 -0400
commit22daf3abceee657ad6e6a035fd6c274fd4bb994d (patch)
tree498e5e3e8e46f59f164cbe3c4826c3e3ccbd60d2
parentf8728874412137d30d5a1d38970ffaabf8fd6e95 (diff)
downloadtaler-ios-22daf3abceee657ad6e6a035fd6c274fd4bb994d.tar.gz
taler-ios-22daf3abceee657ad6e6a035fd6c274fd4bb994d.tar.bz2
taler-ios-22daf3abceee657ad6e6a035fd6c274fd4bb994d.zip
set up linking with command library
-rw-r--r--.gitmodules3
-rw-r--r--Taler.xcodeproj/project.pbxproj42
-rw-r--r--Taler/AppDelegate.swift3
m---------wallet-kotlin0
4 files changed, 48 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..acf60f4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wallet-kotlin"]
+ path = wallet-kotlin
+ url = https://git.taler.net/wallet-kotlin.git
diff --git a/Taler.xcodeproj/project.pbxproj b/Taler.xcodeproj/project.pbxproj
index baea7fd..08e8ecd 100644
--- a/Taler.xcodeproj/project.pbxproj
+++ b/Taler.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
+ D13B019A24D2B0F700ADBE8C /* TalerWallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D13B019924D2B0F700ADBE8C /* TalerWallet.framework */; };
+ D13B019B24D2B0F700ADBE8C /* TalerWallet.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = D13B019924D2B0F700ADBE8C /* TalerWallet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D14AFD2124D232B300C51073 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D14AFD2024D232B300C51073 /* AppDelegate.swift */; };
D14AFD2324D232B300C51073 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D14AFD2224D232B300C51073 /* SceneDelegate.swift */; };
D14AFD2524D232B300C51073 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D14AFD2424D232B300C51073 /* ContentView.swift */; };
@@ -34,7 +36,22 @@
};
/* End PBXContainerItemProxy section */
+/* Begin PBXCopyFilesBuildPhase section */
+ D13B019624D2AC0F00ADBE8C /* Copy Files */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ D13B019B24D2B0F700ADBE8C /* TalerWallet.framework in Copy Files */,
+ );
+ name = "Copy Files";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
/* Begin PBXFileReference section */
+ D13B019924D2B0F700ADBE8C /* TalerWallet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TalerWallet.framework; path = "wallet-kotlin/build/bin/iosX64/debugFramework/TalerWallet.framework"; sourceTree = "<group>"; };
D14AFD1D24D232B300C51073 /* Taler.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Taler.app; sourceTree = BUILT_PRODUCTS_DIR; };
D14AFD2024D232B300C51073 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
D14AFD2224D232B300C51073 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -56,6 +73,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ D13B019A24D2B0F700ADBE8C /* TalerWallet.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -83,6 +101,7 @@
D14AFD3624D232B500C51073 /* TalerTests */,
D14AFD4124D232B500C51073 /* TalerUITests */,
D14AFD1E24D232B300C51073 /* Products */,
+ D1EFA41824D2619B0008B97F /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -136,6 +155,14 @@
path = TalerUITests;
sourceTree = "<group>";
};
+ D1EFA41824D2619B0008B97F /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ D13B019924D2B0F700ADBE8C /* TalerWallet.framework */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -146,6 +173,7 @@
D14AFD1924D232B300C51073 /* Sources */,
D14AFD1A24D232B300C51073 /* Frameworks */,
D14AFD1B24D232B300C51073 /* Resources */,
+ D13B019624D2AC0F00ADBE8C /* Copy Files */,
);
buildRules = (
);
@@ -437,11 +465,18 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"Taler/Preview Content\"";
ENABLE_PREVIEWS = YES;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(PROJECT_DIR)/wallet-kotlin/build/bin/iosX64/debugFramework",
+ "$(PROJECT_DIR)/wallet-kotlin/build/bin/iosArm64/debugFramework",
+ "$(PROJECT_DIR)/wallet-kotlin/build/bin/iosX64/releaseFramework",
+ );
INFOPLIST_FILE = Taler/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.taler.Taler;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
@@ -456,11 +491,18 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"Taler/Preview Content\"";
ENABLE_PREVIEWS = YES;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(PROJECT_DIR)/wallet-kotlin/build/bin/iosX64/debugFramework",
+ "$(PROJECT_DIR)/wallet-kotlin/build/bin/iosArm64/debugFramework",
+ "$(PROJECT_DIR)/wallet-kotlin/build/bin/iosX64/releaseFramework",
+ );
INFOPLIST_FILE = Taler/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.taler.Taler;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
diff --git a/Taler/AppDelegate.swift b/Taler/AppDelegate.swift
index 8728a09..ab96d31 100644
--- a/Taler/AppDelegate.swift
+++ b/Taler/AppDelegate.swift
@@ -7,6 +7,7 @@
//
import UIKit
+import TalerWallet
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -15,6 +16,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
+ let num = Amount.init(currency: "EUR", value: 1, fraction: 99)
+ print(num)
return true
}
diff --git a/wallet-kotlin b/wallet-kotlin
new file mode 160000
+Subproject 91dad4b89cd73f68cbbe36aa6211f39af6cb334