From 845b379e0983f012a2eda65350748307d4b74dca Mon Sep 17 00:00:00 2001 From: Lei Nelissen Date: Sun, 27 Nov 2022 21:07:32 +0100 Subject: [PATCH] fix: android and ios builds --- android/app/build.gradle | 4 +- android/gradle.properties | 2 +- babel.config.js | 3 +- ios/Fintunes.xcodeproj/project.pbxproj | 8 +-- ios/Fintunes/Info.plist | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 77 +++++++++++++------------- package-lock.json | 41 +++++++++++--- package.json | 5 +- 9 files changed, 86 insertions(+), 58 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index fdd9cfb..36ac709 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -138,8 +138,8 @@ android { applicationId "nl.moeilijkedingen.jellyfinaudioplayer" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 11 - versionName "1.2.7" + versionCode 12 + versionName "2.0.0" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/android/gradle.properties b/android/gradle.properties index 9fbae44..9e542da 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -25,7 +25,7 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.125.0 +FLIPPER_VERSION=0.164.0 # Use this property to specify which architecture you want to build. # You can also override it from the CLI using diff --git a/babel.config.js b/babel.config.js index 096f8c5..8573d0e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -32,6 +32,7 @@ module.exports = { [ 'module:react-native-dotenv' ], - 'react-native-reanimated/plugin' + 'react-native-reanimated/plugin', + '@babel/plugin-proposal-numeric-separator' ] }; diff --git a/ios/Fintunes.xcodeproj/project.pbxproj b/ios/Fintunes.xcodeproj/project.pbxproj index d0a1ee1..e96c7b3 100644 --- a/ios/Fintunes.xcodeproj/project.pbxproj +++ b/ios/Fintunes.xcodeproj/project.pbxproj @@ -606,7 +606,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 46; DEVELOPMENT_TEAM = 238P3C58WC; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -643,7 +643,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 46; DEVELOPMENT_TEAM = 238P3C58WC; INFOPLIST_FILE = Fintunes/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -799,7 +799,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 46; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 238P3C58WC; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -832,7 +832,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 46; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 238P3C58WC; GCC_C_LANGUAGE_STANDARD = gnu11; diff --git a/ios/Fintunes/Info.plist b/ios/Fintunes/Info.plist index 177f7f5..bd1a6d4 100644 --- a/ios/Fintunes/Info.plist +++ b/ios/Fintunes/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 6 + 46 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/Podfile b/ios/Podfile index a1e34f5..68bd1bb 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -21,7 +21,7 @@ target 'Fintunes' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - :flipper_configuration => FlipperConfiguration.enabled, + :flipper_configuration => FlipperConfiguration.enabled(["Debug"], {'Flipper' => '0.164.0'}), # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 197eb7d..04931fa 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -10,9 +10,8 @@ PODS: - React-Core (= 0.70.5) - React-jsi (= 0.70.5) - ReactCommon/turbomodule/core (= 0.70.5) - - Flipper (0.125.0): + - Flipper (0.164.0): - Flipper-Folly (~> 2.6) - - Flipper-RSocket (~> 1.4) - Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-DoubleConversion (3.2.0.1) - Flipper-Fmt (7.1.7) @@ -27,48 +26,48 @@ PODS: - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.4.3): - Flipper-Folly (~> 2.6) - - FlipperKit (0.125.0): - - FlipperKit/Core (= 0.125.0) - - FlipperKit/Core (0.125.0): - - Flipper (~> 0.125.0) + - FlipperKit (0.164.0): + - FlipperKit/Core (= 0.164.0) + - FlipperKit/Core (0.164.0): + - Flipper (~> 0.164.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - SocketRocket (~> 0.6.0) - - FlipperKit/CppBridge (0.125.0): - - Flipper (~> 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): + - FlipperKit/CppBridge (0.164.0): + - Flipper (~> 0.164.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.164.0): - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.125.0) - - FlipperKit/FKPortForwarding (0.125.0): + - FlipperKit/FBDefines (0.164.0) + - FlipperKit/FKPortForwarding (0.164.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.125.0) - - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/FlipperKitHighlightOverlay (0.164.0) + - FlipperKit/FlipperKitLayoutHelpers (0.164.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.164.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/FlipperKitLayoutPlugin (0.164.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (0.125.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.164.0) + - FlipperKit/FlipperKitNetworkPlugin (0.164.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/FlipperKitReactPlugin (0.164.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.164.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/SKIOSNetworkPlugin (0.164.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) @@ -315,7 +314,7 @@ PODS: - glog - react-native-blur (4.3.0): - React-Core - - react-native-flipper (0.174.0): + - react-native-flipper (0.164.0): - React-Core - react-native-netinfo (9.3.6): - React-Core @@ -492,7 +491,7 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - Flipper (= 0.125.0) + - Flipper (= 0.164.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - Flipper-DoubleConversion (= 3.2.0.1) - Flipper-Fmt (= 7.1.7) @@ -500,19 +499,19 @@ DEPENDENCIES: - Flipper-Glog (= 0.5.0.5) - Flipper-PeerTalk (= 0.0.4) - Flipper-RSocket (= 1.4.3) - - FlipperKit (= 0.125.0) - - FlipperKit/Core (= 0.125.0) - - FlipperKit/CppBridge (= 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) - - FlipperKit/FBDefines (= 0.125.0) - - FlipperKit/FKPortForwarding (= 0.125.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) - - FlipperKit/FlipperKitReactPlugin (= 0.125.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) + - FlipperKit (= 0.164.0) + - FlipperKit/Core (= 0.164.0) + - FlipperKit/CppBridge (= 0.164.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.164.0) + - FlipperKit/FBDefines (= 0.164.0) + - FlipperKit/FKPortForwarding (= 0.164.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.164.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.164.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.164.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.164.0) + - FlipperKit/FlipperKitReactPlugin (= 0.164.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.164.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.164.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`) - libevent (~> 2.1.12) @@ -698,7 +697,7 @@ SPEC CHECKSUMS: DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: affa4ba1bfdaac110a789192f4d452b053a86624 FBReactNativeSpec: fe8b5f1429cfe83a8d72dc8ed61dc7704cac8745 - Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + Flipper: d08578a2cc23c60c27086b07930efaeb39101342 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b @@ -706,7 +705,7 @@ SPEC CHECKSUMS: Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 + FlipperKit: ddf459d2625ca33f115492de5ba6d970e2576311 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b hermes-engine: 7fe5fc6ef707b7fdcb161b63898ec500e285653d @@ -730,7 +729,7 @@ SPEC CHECKSUMS: React-jsinspector: badd81696361249893a80477983e697aab3c1a34 React-logger: fdda34dd285bdb0232e059b19d9606fa0ec3bb9c react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3 - react-native-flipper: b269b4d4e1ec04f7f443f5edf15100a13e760bf0 + react-native-flipper: c33a4995958ef12a2b2f8290d63bed7adeed7634 react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461 react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a react-native-skia: 7f9a3bd36c4247005e87005d912dcf6db76a6289 @@ -765,6 +764,6 @@ SPEC CHECKSUMS: Yoga: eca980a5771bf114c41a754098cd85e6e0d90ed7 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 9735b44bd285aab03d16f4b0a062c94bf98c573c +PODFILE CHECKSUM: 94434618afff1be257dd0576e9a75bcaa7b48664 COCOAPODS: 1.11.3 diff --git a/package-lock.json b/package-lock.json index fb1955b..70ef9d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "react-native-collapsible": "^1.6.0", "react-native-dotenv": "^3.4.2", "react-native-fast-image": "^8.6.3", - "react-native-flipper": "^0.174.0", + "react-native-flipper": "^0.164.0", "react-native-fs": "^2.20.0", "react-native-gesture-handler": "^2.8.0", "react-native-localize": "^2.2.4", @@ -52,6 +52,7 @@ }, "devDependencies": { "@babel/core": "^7.20.2", + "@babel/plugin-proposal-numeric-separator": "^7.18.6", "@babel/runtime": "^7.20.1", "@react-native-community/eslint-config": "^3.2.0", "@sentry/cli": "^2.8.1", @@ -653,6 +654,22 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-proposal-numeric-separator": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", + "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-proposal-object-rest-spread": { "version": "7.18.9", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz", @@ -13731,9 +13748,9 @@ } }, "node_modules/react-native-flipper": { - "version": "0.174.0", - "resolved": "https://registry.npmjs.org/react-native-flipper/-/react-native-flipper-0.174.0.tgz", - "integrity": "sha512-9WAUxqHLU57dYxD/Z5EkcU/MdP1KFWCxdZfeHJ6Ogq/GbJVawzibjVfGPVwc2GoLIMvE6rZ0Fvvw4AUIdykc/g==", + "version": "0.164.0", + "resolved": "https://registry.npmjs.org/react-native-flipper/-/react-native-flipper-0.164.0.tgz", + "integrity": "sha512-iJhIe3rqx6okuzBp4AJsTa2b8VRAOGzoLRFx/4HGbaGvu8AurZjz8TTQkhJsRma8dsHN2b6KKZPvGGW3wdWzvA==", "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", "react-native": ">0.62.0" @@ -16719,6 +16736,16 @@ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" } }, + "@babel/plugin-proposal-numeric-separator": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", + "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + } + }, "@babel/plugin-proposal-object-rest-spread": { "version": "7.18.9", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz", @@ -26867,9 +26894,9 @@ "integrity": "sha512-Sdw4ESidXCXOmQ9EcYguNY2swyoWmx53kym2zRsvi+VeFCHEdkO+WG1DK+6W81juot40bbfLNhkc63QnWtesNg==" }, "react-native-flipper": { - "version": "0.174.0", - "resolved": "https://registry.npmjs.org/react-native-flipper/-/react-native-flipper-0.174.0.tgz", - "integrity": "sha512-9WAUxqHLU57dYxD/Z5EkcU/MdP1KFWCxdZfeHJ6Ogq/GbJVawzibjVfGPVwc2GoLIMvE6rZ0Fvvw4AUIdykc/g==" + "version": "0.164.0", + "resolved": "https://registry.npmjs.org/react-native-flipper/-/react-native-flipper-0.164.0.tgz", + "integrity": "sha512-iJhIe3rqx6okuzBp4AJsTa2b8VRAOGzoLRFx/4HGbaGvu8AurZjz8TTQkhJsRma8dsHN2b6KKZPvGGW3wdWzvA==" }, "react-native-fs": { "version": "2.20.0", diff --git a/package.json b/package.json index a301331..39c794f 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "start": "react-native start", "test": "jest", "lint": "eslint . --ext .js,.jsx,.ts,.tsx && tsc --noEmit", - "build:ios": "react-native bundle --entry-file='index.ts' --bundle-output='./ios/main.jsbundle' --dev=false --platform='ios'" + "build:ios": "react-native bundle --entry-file='index.js' --bundle-output='./ios/main.jsbundle' --dev=false --platform='ios'" }, "dependencies": { "@react-native-async-storage/async-storage": "^1.17.11", @@ -35,7 +35,7 @@ "react-native-collapsible": "^1.6.0", "react-native-dotenv": "^3.4.2", "react-native-fast-image": "^8.6.3", - "react-native-flipper": "^0.174.0", + "react-native-flipper": "^0.164.0", "react-native-fs": "^2.20.0", "react-native-gesture-handler": "^2.8.0", "react-native-localize": "^2.2.4", @@ -56,6 +56,7 @@ }, "devDependencies": { "@babel/core": "^7.20.2", + "@babel/plugin-proposal-numeric-separator": "^7.18.6", "@babel/runtime": "^7.20.1", "@react-native-community/eslint-config": "^3.2.0", "@sentry/cli": "^2.8.1",