Skip to content

Commit

Permalink
Merge pull request #467 from zooniverse/release/v2.10.0
Browse files Browse the repository at this point in the history 
Release/v2.10.0
  • Loading branch information
@coryzoon
coryzoon authored Oct 25, 2023
2 parents e6ac392 + 9be6d55 commit b70044e
Show file tree
Hide file tree
Showing 9 changed files with 238 additions and 11,586 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ local.properties
.cxx/
*.keystore
!debug.keystore
*.jsk
*.pem
android/app/release/

# node.js
#
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ android {
applicationId "com.zooniversemobile"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 59
versionName "2.9.2"
versionCode 62
versionName "2.10.0"
}
signingConfigs {
debug {
Expand Down
2 changes: 1 addition & 1 deletion ios/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" red="0.02352941176" green="0.537254902" blue="0.6274509804" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
Expand Down
20 changes: 10 additions & 10 deletions ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ PODS:
- react-native-video/Video (= 5.2.1)
- react-native-video/Video (5.2.1):
- React-Core
- react-native-webview (13.6.0):
- react-native-webview (13.6.2):
- React-Core
- React-NativeModulesApple (0.72.4):
- hermes-engine
Expand Down Expand Up @@ -544,16 +544,16 @@ PODS:
- RNScreens (3.25.0):
- React-Core
- React-RCTImage
- RNSentry (5.10.0):
- RNSentry (5.11.1):
- React-Core
- Sentry/HybridSDK (= 8.11.0)
- Sentry/HybridSDK (= 8.13.0)
- RNSVG (13.14.0):
- React-Core
- RNVectorIcons (10.0.0):
- React-Core
- Sentry/HybridSDK (8.11.0):
- SentryPrivate (= 8.11.0)
- SentryPrivate (8.11.0)
- Sentry/HybridSDK (8.13.0):
- SentryPrivate (= 8.13.0)
- SentryPrivate (8.13.0)
- SocketRocket (0.6.1)
- Yoga (1.14.0)
- YogaKit (1.18.1):
Expand Down Expand Up @@ -814,7 +814,7 @@ SPEC CHECKSUMS:
react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284
react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
react-native-webview: 669ae162965f629a8d6a4bdd3b99a304d36ef1f2
react-native-webview: 8fc09f66a1a5b16bbe37c3878fda27d5982bb776
React-NativeModulesApple: edb5ace14f73f4969df6e7b1f3e41bef0012740f
React-perflogger: 496a1a3dc6737f964107cb3ddae7f9e265ddda58
React-RCTActionSheet: 02904b932b50e680f4e26e7a686b33ebf7ef3c00
Expand All @@ -840,11 +840,11 @@ SPEC CHECKSUMS:
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87
RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
RNSentry: 11917f7bf3e28806aca4c2791c6ba7522d8f09fe
RNSentry: e668d4e68fe09d475dc084bab81f02c3be2db173
RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
Sentry: 39d57e691e311bdb73bc1ab5bbebbd6bc890050d
SentryPrivate: 48712023cdfd523735c2edb6b06bedf26c4730a3
Sentry: a067ca1db308066097314d8478e9682f3b575dee
SentryPrivate: 917c91aeb0f199cd079404fab2b50c83e4bad25c
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
Expand Down
27 changes: 16 additions & 11 deletions ios/ZooniverseMobile.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* ZooniverseMobileTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZooniverseMobileTests.m; sourceTree = "<group>"; };
09561D842AAF44DD00927AE0 /* Karla-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Karla-Regular.ttf"; sourceTree = "<group>"; };
09561D852AAF44DE00927AE0 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Light.ttf"; path = "OpenSans-Light.ttf"; sourceTree = "<group>"; };
09561D862AAF44DE00927AE0 /* OpenSans-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Semibold.ttf"; path = "OpenSans-Semibold.ttf"; sourceTree = "<group>"; };
09561D872AAF44DE00927AE0 /* zoo-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "zoo-font.ttf"; path = "zoo-font.ttf"; sourceTree = "<group>"; };
09561D852AAF44DE00927AE0 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Light.ttf"; sourceTree = "<group>"; };
09561D862AAF44DE00927AE0 /* OpenSans-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Semibold.ttf"; sourceTree = "<group>"; };
09561D872AAF44DE00927AE0 /* zoo-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "zoo-font.ttf"; sourceTree = "<group>"; };
09561D882AAF44DE00927AE0 /* Karla-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Karla-Italic.ttf"; sourceTree = "<group>"; };
09561D892AAF44DE00927AE0 /* Karla-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Karla-Bold.ttf"; sourceTree = "<group>"; };
09561D8A2AAF44DF00927AE0 /* Karla-BoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Karla-BoldItalic.ttf"; sourceTree = "<group>"; };
09561D8B2AAF44DF00927AE0 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Bold.ttf"; path = "OpenSans-Bold.ttf"; sourceTree = "<group>"; };
09561D8C2AAF44DF00927AE0 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Regular.ttf"; path = "OpenSans-Regular.ttf"; sourceTree = "<group>"; };
09561D8B2AAF44DF00927AE0 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Bold.ttf"; sourceTree = "<group>"; };
09561D8C2AAF44DF00927AE0 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Regular.ttf"; sourceTree = "<group>"; };
09C7A24F2AB06FC000D82D95 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
09D54E902AAF2663008D50C3 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; };
09D54E912AAF2663008D50C3 /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -547,24 +547,25 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = 888MXXMABP;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = ZooniverseMobile/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.9.2;
MARKETING_VERSION = 2.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = org.mobile.zooniverse;
PRODUCT_NAME = ZooniverseMobile;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
Expand All @@ -575,22 +576,26 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = 888MXXMABP;
INFOPLIST_FILE = ZooniverseMobile/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.9.2;
MARKETING_VERSION = 2.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = org.mobile.zooniverse;
PRODUCT_NAME = ZooniverseMobile;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
Expand Down
Loading

0 comments on commit b70044e

Please sign in to comment.