Merge pull request #18 from kinecosystem/testing-kinbase-podspec

Fixing kinbase podspec

.codecov.yml

@@ -1,7 +1,7 @@
 ignore:
   - "KinSampleApp"
-  - "KinGrpcApi"
   - "KinBaseCompat"
+  - "KinBase/KinBase/Src/Vendor/gen"
   - "KinBase/KinBase/Src/Storage/Gen"
   - "KinBase/KinBase/Src/Tools/ListObservable.swift"
   - "KinBase/KinBase/Src/Stellar/StellarSdkProxy.swift"

KinBase.podspec

@@ -8,7 +8,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'KinBase'
-  s.version          = '0.5.0'
+  s.version          = '1.0.0'
   s.summary          = 'Kin SDK for iOS'
 
   s.description      = <<-DESC
@@ -23,36 +23,25 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '9.0'
   s.swift_version = '5.0'
 
-  non_arc_files = 'KinBase/KinBase/Src/Storage/Gen/*.{h,m}'
+  non_arc_files = 'KinBase/KinBase/Src/Storage/Gen/*.{h,m}', 'KinBase/KinBase/Src/Vendor/gen/**/*.{h,m}'
   s.source_files = 'KinBase/KinBase/**/*.{h,c,swift}'
-
-  s.dependency 'kin-stellar-ios-mac-sdk', '~> 1.7.5'
+
   s.dependency 'PromisesSwift', '~> 1.2.8'
-  s.dependency 'KinGrpcApi', '~> 0.4.0'
-  s.dependency 'Base58Swift', '~> 2.1.10'
-  s.dependency 'Sodium', '~> 0.8.0'
-
-  # Dependencies needed for KinGrpcApi
-  s.dependency 'gRPC-ProtoRPC'
-  s.dependency 'Protobuf'
-
-  s.requires_arc = true
-
+  s.dependency '!ProtoCompiler-gRPCPlugin', '~> 1.28.0'
+  s.dependency 'Protobuf', '~> 3.11.4'
+  s.dependency 'gRPC-ProtoRPC', '~> 1.28.0'
+
   s.subspec 'no-arc' do |sna|
-    sna.requires_arc = false
-    sna.source_files = non_arc_files
-    sna.dependency 'Protobuf', '~> 3.0'
+      sna.requires_arc = false
+      sna.source_files = non_arc_files
+      sna.dependency 'Protobuf', '~> 3.11.4'
   end
 
   s.pod_target_xcconfig = {
       # This is needed by all pods that depend on Protobuf:
-      'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO=1',
+      'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1',
       # This is needed by all pods that depend on gRPC-RxLibrary:
       'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES',
-      # This is needed for the user Podfile to use_framework! https://github.com/CocoaPods/CocoaPods/issues/4605
-      'USE_HEADERMAP' => 'NO',
-      'ALWAYS_SEARCH_USER_PATHS' => 'NO',
-      'USER_HEADER_SEARCH_PATHS' => '$(PODS_ROOT)/KinGrpcApi/KinGrpcApi/gen',
-      'HEADER_SEARCH_PATHS' => '$(PODS_ROOT)/KinGrpcApi/KinGrpcApi/gen'
   }
+
 end

KinBase/KinBase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

KinBase/KinBase.xcodeproj/xcshareddata/xcschemes/KinBase.xcscheme

@@ -37,7 +37,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
@@ -66,7 +66,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

KinBase/KinBase/KinBase.h

@@ -40,4 +40,4 @@ FOUNDATION_EXPORT const unsigned char KinBaseVersionString[];
 
 #import <KinBase/Validate.pbobjc.h>
 
-#import "ed25519.h"
+#import "kined25519.h"

KinBase/KinBase/Src/Storage/KinFileStorage.swift

@@ -349,15 +349,8 @@ private extension KinFileStorage {
         return rootDirectory.appendingPathComponent("kin_storage", isDirectory: true)
     }
 
-    var environmentDirectory: URL {
-        return kinStorageDirectory
-            .appendingPathComponent("env", isDirectory: true)
-            .appendingPathComponent(MD5.digest(network.id).hexEncodedString(), isDirectory: true)
-        // TODO: Verify that MD5 is sufficient for this purpose
-    }
-
     var directoryForAllAccounts: URL {
-        return environmentDirectory.appendingPathComponent("kin_accounts", isDirectory: true)
+        return kinStorageDirectory.appendingPathComponent("kin_accounts", isDirectory: true)
     }
 
     func directoryForAccount(_ account: PublicKey) -> URL {

KinBase/KinBase/Src/Vendor/ed25519/add_scalar.c

@@ -1,4 +1,4 @@
-#include "ed25519.h"
+#include "kined25519.h"
 #include "ge.h"
 #include "sc.h"
 #include "sha512.h"

KinBase/KinBase/Src/Vendor/ed25519/key_exchange.c

@@ -1,4 +1,4 @@
-#include "ed25519.h"
+#include "kined25519.h"
 #include "fe.h"
 
 void ed25519_key_exchange(unsigned char *shared_secret, const unsigned char *public_key, const unsigned char *private_key) {

KinBase/KinBase/Src/Vendor/ed25519/keypair.c

@@ -1,4 +1,4 @@
-#include "ed25519.h"
+#include "kined25519.h"
 #include "sha512.h"
 #include "ge.h"
 

KinBase/KinBase/Src/Vendor/ed25519/ed25519.h → KinBase/KinBase/Src/Vendor/ed25519/kined25519.h

@@ -1,5 +1,5 @@
-#ifndef ED25519_H
-#define ED25519_H
+#ifndef KINED25519_H
+#define KINED25519_H
 
 #include <stddef.h>
 

KinBase/KinBase/Src/Vendor/ed25519/seed.c

@@ -1,4 +1,4 @@
-#include "ed25519.h"
+#include "kined25519.h"
 
 #ifndef ED25519_NO_SEED
 

KinBase/KinBase/Src/Vendor/ed25519/sign.c

@@ -1,4 +1,4 @@
-#include "ed25519.h"
+#include "kined25519.h"
 #include "sha512.h"
 #include "ge.h"
 #include "sc.h"

KinBase/KinBase/Src/Vendor/ed25519/verify.c

@@ -1,4 +1,4 @@
-#include "ed25519.h"
+#include "kined25519.h"
 #include "sha512.h"
 #include "ge.h"
 #include "sc.h"

KinGrpcApi/generate_protos.sh → KinBase/KinBase/generate_protos.sh

@@ -31,7 +31,7 @@ function cleanup {
 trap cleanup EXIT
 
 echo "Cloning kin-api into ${KIN_API_GIT_PATH}"
-git clone -b master --single-branch [email protected]:kinecosystem/agora-api-internal.git ${KIN_API_GIT_PATH}
+git clone -b master --single-branch [email protected]:kinecosystem/agora-api.git ${KIN_API_GIT_PATH}
 
 echo "Cloning protoc-gen-validate into ${VALIDATE_GIT_PATH}"
 git clone -b main --single-branch [email protected]:envoyproxy/protoc-gen-validate.git $VALIDATE_GIT_PATH
@@ -108,3 +108,4 @@ for i in $(find google -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | u
     --grpc_out=${GOOGLE_MODEL_COMMON_GEN_PATH} \
     --plugin=protoc-gen-grpc=${PLUGIN}
 done
+

KinBase/README.md

@@ -7,7 +7,7 @@ The KinBase module is the foundation upon which the rest of the sdk stands on, h
 ## Installation
 Add the following to your Podfile.
 ```
-pod 'KinBase', '~> 0.5.0'
+pod 'KinBase', '~> 1.0.0'
 ```
 
 ## Overview

KinDesign.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'KinDesign'
-  s.version          = '0.5.0'
+  s.version          = '1.0.0'
   s.summary          = 'Kin Design Library for iOS'
 
   s.description      = <<-DESC

KinDesign/KinDesign.xcodeproj/project.pbxproj

@@ -430,7 +430,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinDesign;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -458,7 +458,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinDesign;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

KinDesign/README.md

@@ -10,7 +10,7 @@ All of these components can be tested out and browsed in the [sample app](../Kin
 ## Installation
 Add the following to your project's Podfile.
 ```
-pod 'KinDesign', '~> 0.5.0'
+pod 'KinDesign', '~> 1.0.0'
 ```
 
 ### Primary Button