react-native-smallcase-gateway 1.7.1 → 2.0.0

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.0.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.7.0...v2.0.0) (2022-12-06)
+
+
+### Features
+
+* delete old files ([d85689e](https://github.com/smallcase/react-native-smallcase-gateway/commit/d85689eac4324b8c877a502d539aee7317eb7715))
+* move blank ios swift source files ([c5f1e6e](https://github.com/smallcase/react-native-smallcase-gateway/commit/c5f1e6ed8588474d4cbab1521b3eece92f0c60c4))
+* move js source files to ts ([2331df6](https://github.com/smallcase/react-native-smallcase-gateway/commit/2331df678fe4e9ec23ada7b40ceb1c4bd36cb6b6))
+* move new android files ([634ba90](https://github.com/smallcase/react-native-smallcase-gateway/commit/634ba90383214571f704cf9bff459a0e2e32ac15))
+* move new config files ([645014f](https://github.com/smallcase/react-native-smallcase-gateway/commit/645014fbd8dfeda35eccb8e012a0a6832446c354))
+
+
+### Bug Fixes
+
+* "main" path in package.json ([f29b94b](https://github.com/smallcase/react-native-smallcase-gateway/commit/f29b94b9fa6d3d84952e642bb7077e2c5820998e))
+* add login cta and mf bridge methods to new arch ([ce16ed5](https://github.com/smallcase/react-native-smallcase-gateway/commit/ce16ed5de7610ef38a11e635486a014b3acf5892))
+* index.js imports ([a5272e6](https://github.com/smallcase/react-native-smallcase-gateway/commit/a5272e63f9f23a0d39a2e6f69032dcd2197e099c))
+* ios bridge ([37b900f](https://github.com/smallcase/react-native-smallcase-gateway/commit/37b900f817370de920990fb1cd0dd96f03bd6877))
+* util.ts -> util.js ([3e6f843](https://github.com/smallcase/react-native-smallcase-gateway/commit/3e6f843d2486b2d6982da2045358308e0a3b4ca2))
+* wrong ts usage ([d8125cf](https://github.com/smallcase/react-native-smallcase-gateway/commit/d8125cf55af477011c920e3fd8c33d1f2b65c691))
 ### [1.7.1](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.7.0...v1.7.1) (2022-12-01)
 
 ## [1.7.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.6.3...v1.7.0) (2022-11-24)

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2020 smallcase
-
+Copyright (c) 2022 smallcase
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -18,4 +17,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/android/build.gradle

@@ -1,87 +1,154 @@
-def DEFAULT_COMPILE_SDK_VERSION = 30
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 30
+buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['SmallcaseGateway_kotlinVersion']
+
+  repositories {
+      google()
+      mavenCentral()
+  }
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+  dependencies {
+    classpath 'com.android.tools.build:gradle:3.5.3'
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
 }
 
-def kotlin_version = safeExtGet('kotlinVersion', '1.3.71')
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") &&  rootProject.getProperty("newArchEnabled") == "true"
+}
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
+if (isNewArchitectureEnabled()) {
+  apply plugin: 'com.facebook.react'
+}
 
-buildscript {
-    // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-    def kv = rootProject.ext.has('kotlinVersion')
-            ? rootProject.ext.get('kotlinVersion')
-            : '1.3.71'
-
-    if (project == rootProject) {
-        repositories {
-            google()
-            jcenter()
-        }
-        dependencies {
-            classpath 'com.android.tools.build:gradle:4.0.1'
-            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kv"
-        }
-    } else {
-        repositories {
-            jcenter()
-        }
-
-        dependencies {
-            classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kv")
-        }
-    }
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['SmallcaseGateway_' + name]
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['SmallcaseGateway_' + name]).toInteger()
+}
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
-    defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 01
-        versionName "0.0.1"
-    }
-    lintOptions {
-        abortOnError false
+  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
+    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+
+  lintOptions {
+    disable 'GradleCompatible'
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
 repositories {
-    // ref: https://www.baeldung.com/maven-local-repository
-    mavenLocal()
-    maven {
-        url "https://artifactory.smallcase.com/artifactory/gradle-dev-local"
-        credentials {
-            username "react_native_user"
-            password "reactNativeUser123"
-        }
-    }
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
-    }
+  mavenCentral()
+  google()
+
+  maven {
+      url "https://artifactory.smallcase.com/artifactory/gradle-dev-local"
+      credentials {
+          username "react_native_user"
+          password "reactNativeUser123"
+      }
+  }
+
+  def found = false
+  def defaultDir = null
+  def androidSourcesName = 'React Native sources'
+
+  if (rootProject.ext.has('reactNativeAndroidRoot')) {
+    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
+  } else {
+    defaultDir = new File(
+      projectDir,
+      '/../../../node_modules/react-native/android'
+    )
+  }
+
+  if (defaultDir.exists()) {
     maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../node_modules/jsc-android/dist"
+      url defaultDir.toString()
+      name androidSourcesName
     }
-    google()
-    jcenter()
+
+    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+    found = true
+  } else {
+    def parentDir = rootProject.projectDir
+
+    1.upto(5, {
+      if (found) return true
+      parentDir = parentDir.parentFile
+
+      def androidSourcesDir = new File(
+        parentDir,
+        'node_modules/react-native'
+      )
+
+      def androidPrebuiltBinaryDir = new File(
+        parentDir,
+        'node_modules/react-native/android'
+      )
+
+      if (androidPrebuiltBinaryDir.exists()) {
+        maven {
+          url androidPrebuiltBinaryDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+        found = true
+      } else if (androidSourcesDir.exists()) {
+        maven {
+          url androidSourcesDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+        found = true
+      }
+    })
+  }
+
+  if (!found) {
+    throw new GradleException(
+      "${project.name}: unable to locate React Native android sources. " +
+      "Ensure you have you installed React Native as a dependency in your project and try again."
+    )
+  }
 }
 
+def kotlin_version = getExtOrDefault('kotlinVersion')
+
 dependencies {
-    //noinspection GradleDynamicVersion
+   //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
     implementation 'com.smallcase.gateway:sdk:3.7.0'
     implementation "androidx.core:core-ktx:1.3.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "SmallcaseGateway"
+    codegenJavaPackageName = "com.reactnativesmallcasegateway"
+  }
+}

package/android/gradle.properties

@@ -0,0 +1,5 @@
+SmallcaseGateway_kotlinVersion=1.7.0
+SmallcaseGateway_minSdkVersion=21
+SmallcaseGateway_targetSdkVersion=31
+SmallcaseGateway_compileSdkVersion=31
+SmallcaseGateway_ndkversion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.smallcase.gateway.reactnative">
+          package="com.reactnativesmallcasegateway">
 
 </manifest>

package/android/src/main/java/com/{smallcase/gateway/reactnative → reactnativesmallcasegateway}/SmallcaseGatewayModule.kt

@@ -1,4 +1,4 @@
-package com.smallcase.gateway.reactnative
+package com.reactnativesmallcasegateway
 
 import android.util.Log
 import com.facebook.react.bridge.*
@@ -11,8 +11,7 @@ import com.smallcase.gateway.portal.SmallcaseGatewaySdk
 import com.smallcase.gateway.portal.SmallplugPartnerProps
 import kotlin.Error
 
-
-class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactContextBaseJavaModule(reactContext!!) {
+class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     companion object {
         const val TAG = "SmallcaseGatewayModule"
     }
@@ -21,6 +20,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         return "SmallcaseGateway"
     }
 
+
     @ReactMethod
     fun setConfigEnvironment(envName: String, gateway: String, isLeprechaunActive: Boolean, isAmoEnabled: Boolean, preProvidedBrokers: ReadableArray, promise: Promise) {
 
@@ -347,4 +347,5 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
 
         return errObj
     }
-}
+
+}

package/android/src/main/java/com/{smallcase/gateway/reactnative → reactnativesmallcasegateway}/SmallcaseGatewayPackage.kt

@@ -1,18 +1,16 @@
-package com.smallcase.gateway.reactnative
-
+package com.reactnativesmallcasegateway
 import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JavaScriptModule
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import java.util.*
+
 
 class SmallcaseGatewayPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return Arrays.asList<NativeModule>(SmallcaseGatewayModule(reactContext))
+        return listOf(SmallcaseGatewayModule(reactContext))
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
         return emptyList()
     }
-}
+}

package/ios/SmallcaseGateway-Bridging-Header.h

@@ -0,0 +1,2 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>

package/ios/SmallcaseGateway.m

@@ -1,12 +1,9 @@
-#import "SmallcaseGateway.h"
+#import <React/RCTBridgeModule.h>
 
 #import <SCGateway/SCGateway.h>
 #import <SCGateway/SCGateway-Swift.h>
 
-
-@implementation SmallcaseGateway
-
-RCT_EXPORT_MODULE()
+@interface RCT_EXTERN_MODULE(SmallcaseGateway, NSObject)
 
 //MARK: SDK version helpers
 RCT_REMAP_METHOD(setHybridSdkVersion, sdkVersion: (NSString *)sdkVersion) {
@@ -94,7 +91,7 @@ RCT_REMAP_METHOD(init,
     }];
 }
 
-//MARK: Trigger Transaction
+//MARK: Trigger Mf Transaction
 RCT_REMAP_METHOD(triggerMfTransaction,
                  transactionId:(NSString *)transactionId
                  triggerTransactionWithResolver:(RCTPromiseResolveBlock)resolve
@@ -487,8 +484,3 @@ RCT_REMAP_METHOD(logoutUser,
 }
 
 @end
-
-
-
-
-

package/ios/SmallcaseGateway.swift

@@ -0,0 +1,3 @@
+@objc(SmallcaseGateway)
+class SmallcaseGateway: NSObject {
+}

package/ios/SmallcaseGateway.xcodeproj/project.pbxproj

@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		18B09302250F83470012829C /* SmallcaseGateway.m in Sources */ = {isa = PBXBuildFile; fileRef = 18B09300250F83460012829C /* SmallcaseGateway.m */; };
+		5E555C0D2413F4C50049A1A2 /* SmallcaseGateway.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* SmallcaseGateway.m */; };
+		F4FF95D7245B92E800C19C63 /*  SmallcaseGateway.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /*  SmallcaseGateway.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -24,8 +25,9 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libSmallcaseGateway.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSmallcaseGateway.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		18B09300250F83460012829C /* SmallcaseGateway.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SmallcaseGateway.m; sourceTree = "<group>"; };
-		18B09301250F83460012829C /* SmallcaseGateway.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmallcaseGateway.h; sourceTree = "<group>"; };
+		B3E7B5891CC2AC0600A0062D /* SmallcaseGateway.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SmallcaseGateway.m; sourceTree = "<group>"; };
+		F4FF95D5245B92E700C19C63 /* SmallcaseGateway-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SmallcaseGateway-Bridging-Header.h"; sourceTree = "<group>"; };
+		F4FF95D6245B92E800C19C63 /* SmallcaseGateway.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallcaseGateway.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -57,10 +59,10 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				F4FF95D6245B92E800C19C63 /* SmallcaseGateway.swift */,
+				B3E7B5891CC2AC0600A0062D /* SmallcaseGateway.m */,
+				F4FF95D5245B92E700C19C63 /* SmallcaseGateway-Bridging-Header.h */,
 				134814211AA4EA7D00B7C361 /* Products */,
-				18B09301250F83460012829C /* SmallcaseGateway.h */,
-				18B09300250F83460012829C /* SmallcaseGateway.m */,
-				158F56C62901D6B600238D90 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -100,11 +102,11 @@
 			};
 			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "SmallcaseGateway" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = en;
+			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
-				Base,
 			);
 			mainGroup = 58B511D21A9E6C8500147676;
 			productRefGroup = 58B511D21A9E6C8500147676;
@@ -121,7 +123,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				18B09302250F83470012829C /* SmallcaseGateway.m in Sources */,
+				F4FF95D7245B92E800C19C63 /* SmallcaseGateway.swift in Sources */,
+				B3E7B58A1CC2AC0600A0062D /* SmallcaseGateway.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -132,7 +135,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -141,14 +143,12 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -159,6 +159,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -174,13 +175,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
-				LIBRARY_SEARCH_PATHS = (
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
-					"\"$(inherited)\"",
-				);
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -191,7 +186,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -200,14 +194,12 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -218,6 +210,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -226,13 +219,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
-				LIBRARY_SEARCH_PATHS = (
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
-					"\"$(inherited)\"",
-				);
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -252,6 +239,9 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = SmallcaseGateway;
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "SmallcaseGateway-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -268,6 +258,8 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = SmallcaseGateway;
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "SmallcaseGateway-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};