From a8b9bd1092b13d65260b7f6aae5e0698ff84bb6c Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Thu, 16 Nov 2023 17:20:27 -0600 Subject: [PATCH] Updates Harmony to use OSLog --- Delta/Supporting Files/Info.plist | 16 ++++ External/Harmony | 2 +- Podfile.lock | 2 +- Pods/Local Podspecs/Harmony.podspec.json | 2 +- Pods/Manifest.lock | 2 +- Pods/Pods.xcodeproj/project.pbxproj | 106 +++++++++++------------ 6 files changed, 73 insertions(+), 57 deletions(-) diff --git a/Delta/Supporting Files/Info.plist b/Delta/Supporting Files/Info.plist index 0447cfe..d21eafc 100644 --- a/Delta/Supporting Files/Info.plist +++ b/Delta/Supporting Files/Info.plist @@ -435,5 +435,21 @@ + OSLogPreferences + + com.rileytestut.Harmony + + Sync + + Level + + Enable + Info + Persist + Info + + + + diff --git a/External/Harmony b/External/Harmony index d348fc7..2beecc9 160000 --- a/External/Harmony +++ b/External/Harmony @@ -1 +1 @@ -Subproject commit d348fc7440198fd91183d2236e3816dee8cc24ee +Subproject commit 2beecc979f845024139b600de57e1802587ef615 diff --git a/Podfile.lock b/Podfile.lock index 79e05fd..94825a2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -130,7 +130,7 @@ SPEC CHECKSUMS: GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213 GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba - Harmony: 5fdc51d0a4f2ce7dcd4439becbbdda1fac4c9e3f + Harmony: 1d8166b6168eec8cce046c4366765d15f7e3b9fc MelonDSDeltaCore: 46193f4fd88e4e18e4a5c841b1ae02dc46d1daa6 N64DeltaCore: 4eeb468746722952bcd5467ecb9ebe7df070f53a NESDeltaCore: ffae3bba878fc505bac0914150a695ede7bc9550 diff --git a/Pods/Local Podspecs/Harmony.podspec.json b/Pods/Local Podspecs/Harmony.podspec.json index 1ab3c93..2934a79 100644 --- a/Pods/Local Podspecs/Harmony.podspec.json +++ b/Pods/Local Podspecs/Harmony.podspec.json @@ -5,7 +5,7 @@ "description": "iOS framework that automatically syncs Core Data databases across different backends.", "homepage": "https://github.com/rileytestut/Harmony", "platforms": { - "ios": "12.0" + "ios": "14.0" }, "source": { "git": "https://github.com/rileytestut/Harmony.git" diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 79e05fd..94825a2 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -130,7 +130,7 @@ SPEC CHECKSUMS: GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213 GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba - Harmony: 5fdc51d0a4f2ce7dcd4439becbbdda1fac4c9e3f + Harmony: 1d8166b6168eec8cce046c4366765d15f7e3b9fc MelonDSDeltaCore: 46193f4fd88e4e18e4a5c841b1ae02dc46d1daa6 N64DeltaCore: 4eeb468746722952bcd5467ecb9ebe7df070f53a NESDeltaCore: ffae3bba878fc505bac0914150a695ede7bc9550 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index a72b0ed..753a916 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -12645,6 +12645,31 @@ }; name = Release; }; + 1A1444025E75F6B39111B81990FB1920 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = DE938F9D29DEE2089E52BCE4D765DF2B /* Harmony.debug.xcconfig */; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + GCC_PREFIX_HEADER = "Target Support Files/Harmony/Harmony-prefix.pch"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MODULEMAP_FILE = Headers/Public/Harmony/Harmony.modulemap; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PRIVATE_HEADERS_FOLDER_PATH = ""; + PRODUCT_MODULE_NAME = Harmony; + PRODUCT_NAME = Harmony; + PUBLIC_HEADERS_FOLDER_PATH = ""; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; 1E7F8B6EB3D07FA3D8236A4BCB55962F /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 698A11ECCAF009BA9765514FEF63E5D2 /* SNESDeltaCore.release.xcconfig */; @@ -12795,6 +12820,32 @@ }; name = Release; }; + 2F70207C6F18AF342FEC2F08613C804F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 143773242E2A521744AB37B4F8D49425 /* Harmony.release.xcconfig */; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + GCC_PREFIX_HEADER = "Target Support Files/Harmony/Harmony-prefix.pch"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MODULEMAP_FILE = Headers/Public/Harmony/Harmony.modulemap; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PRIVATE_HEADERS_FOLDER_PATH = ""; + PRODUCT_MODULE_NAME = Harmony; + PRODUCT_NAME = Harmony; + PUBLIC_HEADERS_FOLDER_PATH = ""; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; 3312B6D3B835689CC7619671A911CF1F /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 14C688327822408CE66949114C33CC83 /* GoogleAPIClientForREST.release.xcconfig */; @@ -13643,32 +13694,6 @@ }; name = Debug; }; - 979B8CE91B81CC23F92BFAF9017FD30E /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 143773242E2A521744AB37B4F8D49425 /* Harmony.release.xcconfig */; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - GCC_PREFIX_HEADER = "Target Support Files/Harmony/Harmony-prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MODULEMAP_FILE = Headers/Public/Harmony/Harmony.modulemap; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_MODULE_NAME = Harmony; - PRODUCT_NAME = Harmony; - PUBLIC_HEADERS_FOLDER_PATH = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; 99FB94707B9559CB88ACBC1B6D5AA3F1 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9E90A4E912BD6E255A8140BE26A53D08 /* SDWebImage.debug.xcconfig */; @@ -14092,31 +14117,6 @@ }; name = Debug; }; - FB4707879DC0D9B9AB55309F19257D69 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = DE938F9D29DEE2089E52BCE4D765DF2B /* Harmony.debug.xcconfig */; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - GCC_PREFIX_HEADER = "Target Support Files/Harmony/Harmony-prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MODULEMAP_FILE = Headers/Public/Harmony/Harmony.modulemap; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_MODULE_NAME = Harmony; - PRODUCT_NAME = Harmony; - PUBLIC_HEADERS_FOLDER_PATH = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -14294,8 +14294,8 @@ 7C3E1190ABE8B5371898BF25BD61572F /* Build configuration list for PBXNativeTarget "Harmony" */ = { isa = XCConfigurationList; buildConfigurations = ( - FB4707879DC0D9B9AB55309F19257D69 /* Debug */, - 979B8CE91B81CC23F92BFAF9017FD30E /* Release */, + 1A1444025E75F6B39111B81990FB1920 /* Debug */, + 2F70207C6F18AF342FEC2F08613C804F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release;