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.

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

Release/3.1.0 #100

Merged
merged 13 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ android {
applicationId 'com.shapeshift.droid_shapeshift'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "3.0.0"
versionCode 324
versionName "3.1.0"
}
signingConfigs {
debug {
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
ext {
buildToolsVersion = "34.0.0"
minSdkVersion = 33
minSdkVersion = 23
compileSdkVersion = 34
targetSdkVersion = 34
kotlinVersion = '1.9.23'
Expand Down
78 changes: 69 additions & 9 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1272,13 +1272,73 @@ PODS:
- React-perflogger (= 0.74.1)
- React-utils (= 0.74.1)
- RNCAsyncStorage (1.23.1):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Codegen
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNCClipboard (1.11.1):
- React-Core
- RNScrypt (1.2.3):
- React
- RNSVG (15.2.0):
- RNSVG (15.3.0):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Codegen
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNSVG/common (= 15.3.0)
- Yoga
- RNSVG/common (15.3.0):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Codegen
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- SocketRocket (0.7.0)
- Yoga (0.0.0)

Expand Down Expand Up @@ -1519,9 +1579,9 @@ SPEC CHECKSUMS:
ExpoFont: 690b76008be824e47907f200cb0764870108dfd1
ExpoKeepAwake: 3b8815d9dd1d419ee474df004021c69fdd316d08
ExpoLocalAuthentication: 9e02a56a4cf9868f0052656a93d4c94101a42ed7
ExpoModulesCore: 4eb2165cde325c8c121d495bb8beb0da9b30c92e
ExpoModulesCore: 521e2ded3d986c46907c7d8ecf28526eca3ef6d6
ExpoSecureStore: 5f6b712785986b54d95a92bd365aabb82a52088e
EXSplashScreen: d439ca817211886dc80a00f3761e3b6d861d7205
EXSplashScreen: 4e1d5c1b3371f7e72c1f158f04bbba6eb61dbd93
FBLazyVector: 898d14d17bf19e2435cafd9ea2a1033efe445709
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
Expand Down Expand Up @@ -1551,17 +1611,17 @@ SPEC CHECKSUMS:
React-logger: 7e7403a2b14c97f847d90763af76b84b152b6fce
React-Mapbuffer: 11029dcd47c5c9e057a4092ab9c2a8d10a496a33
react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
react-native-shake: 19cd773446e7bc2b3792493342d722caa09d890e
react-native-shake: 8d690283896bb6718e2fafeb818928569fdf6db6
react-native-simple-crypto: 499ddd9f317932677e50393e58e7a72bca2a86e1
react-native-webview: 05bae3a03a1e4f59568dfc05286c0ebf8954106c
react-native-webview: 7d3d3247f697c5eeae0a11ef4fb7004ef2e52dd4
React-nativeconfig: b0073a590774e8b35192fead188a36d1dca23dec
React-NativeModulesApple: df46ff3e3de5b842b30b4ca8a6caae6d7c8ab09f
React-perflogger: 3d31e0d1e8ad891e43a09ac70b7b17a79773003a
React-RCTActionSheet: c4a3a134f3434c9d7b0c1054f1a8cfed30c7a093
React-RCTAnimation: 0e5d15320eeece667fcceb6c785acf9a184e9da1
React-RCTAppDelegate: c4f6c0700b8950a8b18c2e004996eec1807d430a
React-RCTAppDelegate: 3ab57e497300ec1c54b798ba2d0834ee048229f4
React-RCTBlob: c46aaaee693d371a1c7cae2a8c8ee2aa7fbc1adb
React-RCTFabric: 0dbf28ce96c7f2843483e32a725a5b5793584ff3
React-RCTFabric: 82f15dc5a981288bfa806545f943cbd18e794ad7
React-RCTImage: a04dba5fcc823244f5822192c130ecf09623a57f
React-RCTLinking: 533bf13c745fcb2a0c14e0e49fd149586a7f0d14
React-RCTNetwork: a29e371e0d363d7b4c10ab907bc4d6ae610541e9
Expand All @@ -1577,10 +1637,10 @@ SPEC CHECKSUMS:
React-runtimescheduler: e2152ed146b6a35c07386fc2ac4827b27e6aad12
React-utils: 3285151c9d1e3a28a9586571fc81d521678c196d
ReactCommon: f42444e384d82ab89184aed5d6f3142748b54768
RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
RNCAsyncStorage: f2add1326156dc313df59d855c11f459059e4ffd
RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd
RNScrypt: 2dcfcc34960afb8836c947b0510167a18ebb0a5a
RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec
RNSVG: 7b44aa4df2587946e28496adf2e10a16f08c1250
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
Yoga: b9a182ab00cf25926e7f79657d08c5d23c2d03b0

Expand Down
48 changes: 31 additions & 17 deletions ios/shapeshift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -331,14 +331,18 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 7882V35EPB;
ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"FB_SONARKIT_ENABLED=1",
);
INFOPLIST_FILE = ShapeShift/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -347,11 +351,14 @@
);
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift;
PRODUCT_NAME = "ShapeShift";
PRODUCT_NAME = ShapeShift;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1";
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
Expand All @@ -364,9 +371,13 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 7882V35EPB;
INFOPLIST_FILE = ShapeShift/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -375,10 +386,13 @@
);
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift;
PRODUCT_NAME = "ShapeShift";
PRODUCT_NAME = ShapeShift;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1";
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
Expand Down Expand Up @@ -435,14 +449,14 @@
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD = "";
LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down Expand Up @@ -494,13 +508,13 @@
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD = "";
LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
" ",
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
Loading
Loading