Skip to content

Commit

Permalink
Merge branch 'master' into PE-732-CGN-header-on-scroll
Browse files Browse the repository at this point in the history
  • Loading branch information
LeleDallas authored Nov 4, 2024
2 parents 6a50b96 + 47fd544 commit 5265b68
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
3 changes: 0 additions & 3 deletions android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@
-keep class com.google.android.gms.** { *; }
-dontwarn com.google.android.gms.**

#Instabug
-dontwarn com.instabug.**

# React-native Keychain
-keep class com.facebook.crypto.** {
*;
Expand Down
10 changes: 0 additions & 10 deletions ios/ItaliaApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
5389C36762A04AE69D762289 /* RobotoMono-RegularItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "RobotoMono-RegularItalic.ttf"; path = "../assets/fonts/RobotoMono/RobotoMono-RegularItalic.ttf"; sourceTree = "<group>"; };
59BCC34321A36ABA56F255E3 /* libPods-ItaliaApp-ItaliaAppTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ItaliaApp-ItaliaAppTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
640E574519CA4183B230AF22 /* RobotoMono-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "RobotoMono-LightItalic.ttf"; path = "../assets/fonts/RobotoMono/RobotoMono-LightItalic.ttf"; sourceTree = "<group>"; };
6C4A0A2AB90C8575993DF1E1 /* Instabug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Instabug.framework; path = "../node_modules/instabug-reactnative/ios/Instabug.framework"; sourceTree = "<group>"; };
6D0115BDF703AEBFD8B86A12 /* Pods-ItaliaApp-ItaliaAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ItaliaApp-ItaliaAppTests.debug.xcconfig"; path = "Target Support Files/Pods-ItaliaApp-ItaliaAppTests/Pods-ItaliaApp-ItaliaAppTests.debug.xcconfig"; sourceTree = "<group>"; };
6F8C6AF94C801CE01EC3D81A /* Pods-ItaliaApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ItaliaApp.release.xcconfig"; path = "Target Support Files/Pods-ItaliaApp/Pods-ItaliaApp.release.xcconfig"; sourceTree = "<group>"; };
722056DF161D843DD91D88A7 /* Pods-ItaliaApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ItaliaApp.debug.xcconfig"; path = "Target Support Files/Pods-ItaliaApp/Pods-ItaliaApp.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -263,7 +262,6 @@
children = (
F0625E7B2326822400EDEF90 /* libReact-RCTImage.a */,
F0625E792326820B00EDEF90 /* libReact-RCTImage.a */,
6C4A0A2AB90C8575993DF1E1 /* Instabug.framework */,
A88AAE92C2AA92D33DB25F0C /* libPods-ItaliaApp.a */,
59BCC34321A36ABA56F255E3 /* libPods-ItaliaApp-ItaliaAppTests.a */,
);
Expand Down Expand Up @@ -779,10 +777,6 @@
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = M2X5YQ4BJ7;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"../node_modules/instabug-reactnative/ios",
);
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ItaliaApp/Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
Expand Down Expand Up @@ -820,10 +814,6 @@
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = M2X5YQ4BJ7;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"../node_modules/instabug-reactnative/ios",
);
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ItaliaApp/Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
Expand Down

0 comments on commit 5265b68

Please sign in to comment.