Browse Source

FIX | Build

pull/10/head
Vitalik 11 months ago
parent
commit
ecc008ee5a
  1. 4
      android/app/build.gradle
  2. 9
      android/build.gradle
  3. 22
      ios/Podfile
  4. 152
      ios/Podfile.lock
  5. 6
      ios/taskme2.xcodeproj/project.pbxproj
  6. 11
      package-lock.json
  7. 4
      package.json

4
android/app/build.gradle

@ -25,8 +25,8 @@ android { @@ -25,8 +25,8 @@ android {
applicationId "com.app.task_me"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 210
versionName "2.1"
versionCode 212
versionName "2.2"
resValue "string", "build_config_package", "com.app.task_me"
}

9
android/build.gradle

@ -23,4 +23,13 @@ buildscript { @@ -23,4 +23,13 @@ buildscript {
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
afterEvaluate {
project ->
if (project.hasProperty("android")) {
android {
compileSdkVersion = 33
buildToolsVersion = "30.0.3"
}
}
}
}

22
ios/Podfile

@ -53,14 +53,22 @@ target 'taskme2' do @@ -53,14 +53,22 @@ target 'taskme2' do
end
post_install do |installer|
react_native_post_install(
installer,
# Set `mac_catalyst_enabled` to `true` in order to apply patches
# necessary for Mac Catalyst builds
:mac_catalyst_enabled => false
)
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
installer.pods_project.build_configurations.each do |config|
installer.pods_project.targets.each do |target|
if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
end
end
# Set the preprocessing macro for the whole Pods project
existing_flags = config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)']
existing_flags << '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = existing_flags
end
end
end

152
ios/Podfile.lock

@ -91,15 +91,15 @@ PODS: @@ -91,15 +91,15 @@ PODS:
- libwebp/mux (1.2.4):
- libwebp/demux
- libwebp/webp (1.2.4)
- OneSignalXCFramework (3.12.4):
- OneSignalXCFramework/OneSignalCore (= 3.12.4)
- OneSignalXCFramework/OneSignalExtension (= 3.12.4)
- OneSignalXCFramework/OneSignalOutcomes (= 3.12.4)
- OneSignalXCFramework/OneSignalCore (3.12.4)
- OneSignalXCFramework/OneSignalExtension (3.12.4):
- OneSignalXCFramework (3.12.6):
- OneSignalXCFramework/OneSignalCore (= 3.12.6)
- OneSignalXCFramework/OneSignalExtension (= 3.12.6)
- OneSignalXCFramework/OneSignalOutcomes (= 3.12.6)
- OneSignalXCFramework/OneSignalCore (3.12.6)
- OneSignalXCFramework/OneSignalExtension (3.12.6):
- OneSignalXCFramework/OneSignalCore
- OneSignalXCFramework/OneSignalOutcomes
- OneSignalXCFramework/OneSignalOutcomes (3.12.4):
- OneSignalXCFramework/OneSignalOutcomes (3.12.6):
- OneSignalXCFramework/OneSignalCore
- OpenSSL-Universal (1.1.1100)
- RCT-Folly (2021.07.22.00):
@ -353,31 +353,34 @@ PODS: @@ -353,31 +353,34 @@ PODS:
- React-jsinspector (0.71.9)
- React-logger (0.71.9):
- glog
- react-native-cameraroll (5.7.2):
- react-native-cameraroll (5.10.0):
- React-Core
- react-native-config (1.5.1):
- react-native-config/App (= 1.5.1)
- react-native-config/App (1.5.1):
- React-Core
- react-native-config/Extension (1.5.1)
- react-native-date-picker (4.2.13):
- react-native-date-picker (4.3.5):
- React-Core
- react-native-document-picker (9.0.1):
- react-native-document-picker (9.1.0):
- React-Core
- react-native-html-to-pdf (0.12.0):
- React-Core
- react-native-image-picker (5.6.0):
- react-native-image-picker (5.7.0):
- React-Core
- react-native-netinfo (9.4.1):
- react-native-netinfo (9.5.0):
- React-Core
- react-native-onesignal (4.5.1):
- OneSignalXCFramework (= 3.12.4)
- react-native-onesignal (4.5.2):
- OneSignalXCFramework (= 3.12.6)
- React (< 1.0.0, >= 0.13.0)
- react-native-pager-view (6.2.0):
- react-native-pager-view (6.2.3):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-print (0.11.0):
- React-Core
- react-native-restart (0.0.27):
- React-Core
- react-native-safe-area-context (4.7.1):
- react-native-safe-area-context (4.8.1):
- React-Core
- react-native-splash-screen (3.3.0):
- React-Core
@ -388,7 +391,7 @@ PODS: @@ -388,7 +391,7 @@ PODS:
- react-native-video/Video (= 5.2.1)
- react-native-video/Video (5.2.1):
- React-Core
- react-native-webrtc (111.0.3):
- react-native-webrtc (111.0.6):
- JitsiWebRTC (~> 111.0.0)
- React-Core
- React-perflogger (0.71.9)
@ -481,13 +484,13 @@ PODS: @@ -481,13 +484,13 @@ PODS:
- React-Core
- RNAudioRecorderPlayer (3.5.3):
- React-Core
- RNCAsyncStorage (1.19.1):
- RNCAsyncStorage (1.21.0):
- React-Core
- RNCClipboard (1.5.1):
- React-Core
- RNCPicker (2.4.10):
- RNCPicker (2.6.1):
- React-Core
- RNDeviceInfo (10.8.0):
- RNDeviceInfo (10.12.0):
- React-Core
- RNFastImage (8.6.3):
- React-Core
@ -495,63 +498,40 @@ PODS: @@ -495,63 +498,40 @@ PODS:
- SDWebImageWebPCoder (~> 0.8.4)
- RNFS (2.20.0):
- React-Core
- RNGestureHandler (2.12.1):
- RNGestureHandler (2.14.0):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- RNImageCropPicker (0.40.0):
- RNImageCropPicker (0.40.2):
- React-Core
- React-RCTImage
- RNImageCropPicker/QBImagePickerController (= 0.40.0)
- RNImageCropPicker/QBImagePickerController (= 0.40.2)
- TOCropViewController
- RNImageCropPicker/QBImagePickerController (0.40.0):
- RNImageCropPicker/QBImagePickerController (0.40.2):
- React-Core
- React-RCTImage
- TOCropViewController
- RNNotifee (7.8.0):
- RNNotifee (7.8.2):
- React-Core
- RNNotifee/NotifeeCore (= 7.8.0)
- RNNotifee/NotifeeCore (7.8.0):
- RNNotifee/NotifeeCore (= 7.8.2)
- RNNotifee/NotifeeCore (7.8.2):
- React-Core
- RNPermissions (3.8.4):
- RNPermissions (3.10.1):
- React-Core
- RNReanimated (3.4.2):
- DoubleConversion
- FBLazyVector
- FBReactNativeSpec
- glog
- hermes-engine
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-callinvoker
- RNReanimated (3.6.1):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- React-Core/DevSupport
- React-Core/RCTWebSocket
- React-CoreModules
- React-cxxreact
- React-hermes
- React-jsi
- React-jsiexecutor
- React-jsinspector
- React-RCTActionSheet
- React-RCTAnimation
- React-RCTBlob
- React-RCTImage
- React-RCTLinking
- React-RCTNetwork
- React-RCTSettings
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.24.0):
- RNScreens (3.29.0):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- React-RCTImage
- RNShare (9.2.3):
- RNShare (9.4.1):
- React-Core
- RNSoundLevel (1.2.1):
- React
- RNSVG (13.10.0):
- RNSVG (13.14.0):
- React-Core
- RNVectorIcons (10.0.0):
- RNVectorIcons (10.0.3):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- SDWebImage (5.11.1):
- SDWebImage/Core (= 5.11.1)
@ -623,6 +603,7 @@ DEPENDENCIES: @@ -623,6 +603,7 @@ DEPENDENCIES:
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
- react-native-onesignal (from `../node_modules/react-native-onesignal`)
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
- react-native-print (from `../node_modules/react-native-print`)
- react-native-restart (from `../node_modules/react-native-restart`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
@ -749,6 +730,8 @@ EXTERNAL SOURCES: @@ -749,6 +730,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-onesignal"
react-native-pager-view:
:path: "../node_modules/react-native-pager-view"
react-native-print:
:path: "../node_modules/react-native-print"
react-native-restart:
:path: "../node_modules/react-native-restart"
react-native-safe-area-context:
@ -851,7 +834,7 @@ SPEC CHECKSUMS: @@ -851,7 +834,7 @@ SPEC CHECKSUMS:
JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
OneSignalXCFramework: 087934ab0d4d7445fcf1c015c7c782359e26c020
OneSignalXCFramework: ff1c970b7aeb4ac0fe48fb35393eb5d8bf378135
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
RCTRequired: edad2afb54f1621f3515ac77a02f395653e3e05d
@ -867,21 +850,22 @@ SPEC CHECKSUMS: @@ -867,21 +850,22 @@ SPEC CHECKSUMS:
React-jsiexecutor: f2759b459772b281f569181a75d48ed2f4df6416
React-jsinspector: f4ccc5e774f1f7530f55f5367826f7158e3146aa
React-logger: 48c0f8e4e2314c50661a827019b506c172328049
react-native-cameraroll: 134805127580aed23403b8c2cb1548920dd77b3a
react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
react-native-date-picker: 04e866ba4e7857f83abd504ad42e787f0f02ae00
react-native-document-picker: 2b8f18667caee73a96708a82b284a4f40b30a156
react-native-date-picker: 90d1d60802a20085125657940b944f2bb4e5c113
react-native-document-picker: b4f4a23b73f864ce17965b284c0757648993805b
react-native-html-to-pdf: 4c5c6e26819fe202971061594058877aa9b25265
react-native-image-picker: db60857e03d63721f19b6f4027de20429ddd9cba
react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
react-native-onesignal: 7bd44dbd031d8d57110c0203836ffc37ddead526
react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
react-native-image-picker: 3269f75c251cdcd61ab51b911dd30d6fff8c6169
react-native-netinfo: 48c5f79a84fbc3ba1d28a8b0d04adeda72885fa8
react-native-onesignal: ab800900cffeca4d9db70a05244013fc8a36ceb8
react-native-pager-view: e26d35e382d86950c936f8917e3beb9188115ccc
react-native-print: f704aef52d931bfce6d1d84351dbb5232d7ecb89
react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2
react-native-safe-area-context: cd1169d797a2ef722a00bfc5af10748d5b6c94f9
react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
react-native-webrtc: 4d1669c2ed29767fe70b0169428b4466589ecf8b
react-native-webrtc: 255a1172fd31525b952b36aef7b8e9a41de325e5
React-perflogger: 78c280669d99aef163e23331366f5914a7298dae
React-RCTActionSheet: 2698ce0f5d8fea91977c591c83de66b501c6d41d
React-RCTAnimation: d9d448c8cc86549b0aa2c9f0c00d18c1efcebda5
@ -898,22 +882,22 @@ SPEC CHECKSUMS: @@ -898,22 +882,22 @@ SPEC CHECKSUMS:
ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNAudioRecorderPlayer: 6638283925b46808310c9fdf803ebabc3abdbadc
RNCAsyncStorage: f47fe18526970a69c34b548883e1aeceb115e3e1
RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
RNCPicker: 0bc2f0a29abcca7b7ed44a2d036aac9ab6d25700
RNDeviceInfo: 5795b418ed3451ebcaf39384e6cf51f60cb931c9
RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
RNDeviceInfo: db5c64a060e66e5db3102d041ebe3ef307a85120
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
RNNotifee: f3c01b391dd8e98e67f539f9a35a9cbcd3bae744
RNPermissions: daf6696301cf49872d6082345083446b0fe59fad
RNReanimated: 49cdb63e767bb7e743ff4c12f7d85722c0d008f2
RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
RNShare: da6d90b6dc332f51f86498041d6e34211f96b630
RNGestureHandler: 32a01c29ecc9bb0b5bf7bc0a33547f61b4dc2741
RNImageCropPicker: d9616a0cb9b72e8551ff94a7a5021fbd29050aa5
RNNotifee: 8e2d3df3f0e9ce8f5d1fe4c967431138190b6175
RNPermissions: 0a4aa6c2f46c2cd55fbfa095bcdbad20118ea46f
RNReanimated: dc83bf2068bbc91572938337c5b2030641de1415
RNScreens: 3c5b9f4a9dcde752466854b6109b79c0e205dad3
RNShare: 32e97adc8d8c97d4a26bcdd3c45516882184f8b6
RNSoundLevel: c031ed233382b6aeabe44b3d5e895b906e69952f
RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
RNVectorIcons: 64e6a523ac30a3241efa9baf1ffbcc5e76ff747a
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
@ -921,6 +905,6 @@ SPEC CHECKSUMS: @@ -921,6 +905,6 @@ SPEC CHECKSUMS:
Yoga: 540948b36b46e9469992c4d30ddcc21110b8afe5
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
PODFILE CHECKSUM: c269a7efafc308e998d432292530c667a3d2655c
PODFILE CHECKSUM: 095bd78c7e441b078aaefe701443011e2d5a1ea7
COCOAPODS: 1.12.1
COCOAPODS: 1.14.3

6
ios/taskme2.xcodeproj/project.pbxproj

@ -720,7 +720,7 @@ @@ -720,7 +720,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = taskme2/taskme2Stage.Release.entitlements;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = HQ3J3TDPR2;
INFOPLIST_FILE = taskme2/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Task me ;)";
@ -899,7 +899,7 @@ @@ -899,7 +899,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = taskme2/taskme2.entitlements;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = HQ3J3TDPR2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = taskme2/Info.plist;
@ -936,7 +936,7 @@ @@ -936,7 +936,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = taskme2/taskme2.entitlements;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = HQ3J3TDPR2;
INFOPLIST_FILE = taskme2/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Task me ;)";

11
package-lock.json generated

@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
"react-native-onesignal": "^4.5.1",
"react-native-pager-view": "^6.2.0",
"react-native-permissions": "^3.8.4",
"react-native-print": "^0.6.0",
"react-native-print": "github:bitalikr1999/react-native-print",
"react-native-raw-bottom-sheet": "^2.2.0",
"react-native-reanimated": "^3.4.1",
"react-native-restart": "^0.0.27",
@ -14510,12 +14510,9 @@ @@ -14510,12 +14510,9 @@
}
},
"node_modules/react-native-print": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/react-native-print/-/react-native-print-0.6.0.tgz",
"integrity": "sha512-lWGI5JoB/crLRlukuB7FMmfjSOwC8Cia9JHVEFjpnQWGtnRSLY+oRYwgFLzll7XPi7LqUNohFKT+jsRMA/1bRg==",
"peerDependencies": {
"react-native": ">=0.8.0 || 0.8.0-rc || 0.8.0-rc.2 || 0.9.0-rc || 0.10.1"
}
"version": "0.11.0",
"resolved": "git+ssh://git@github.com/bitalikr1999/react-native-print.git#5dd6d38c222ed834a7b50e911b9a0ebb7b8fe968",
"license": "MIT"
},
"node_modules/react-native-raw-bottom-sheet": {
"version": "2.2.0",

4
package.json

@ -9,10 +9,8 @@ @@ -9,10 +9,8 @@
"start": "react-native start",
"test": "jest",
"postinstall": "react-native setup-ios-permissions && pod-install",
"aos:clean": "cd android && ./gradlew clean",
"aos:dev": "ENVFILE=.env.development react-native run-android",
"aos:stage": "ENVFILE=.env.stage react-native run-android",
"aos:build:stage": "cd android && ENVFILE=.env.stage ./gradlew assembleRelease",
"aos:prod": "ENVFILE=.env.production react-native run-android",
@ -73,7 +71,7 @@ @@ -73,7 +71,7 @@
"react-native-onesignal": "^4.5.1",
"react-native-pager-view": "^6.2.0",
"react-native-permissions": "^3.8.4",
"react-native-print": "^0.6.0",
"react-native-print": "github:bitalikr1999/react-native-print",
"react-native-raw-bottom-sheet": "^2.2.0",
"react-native-reanimated": "^3.4.1",
"react-native-restart": "^0.0.27",

Loading…
Cancel
Save