From 63a17fe1b567a0f1f1ef27d1133865bbbd7d2dec Mon Sep 17 00:00:00 2001 From: Test Date: Sat, 10 Sep 2022 18:53:53 +0200 Subject: [PATCH 1/4] add adjust sdk --- OpenDocumentReader.xcodeproj/project.pbxproj | 30 ++++-- OpenDocumentReader/AppDelegate.swift | 7 ++ OpenDocumentReader/BridgingHeader.h | 2 + Podfile | 1 + Podfile.lock | 96 +++++++++++--------- 5 files changed, 83 insertions(+), 53 deletions(-) diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index 56e81ce..e6fb382 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -8,6 +8,9 @@ /* Begin PBXBuildFile section */ 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */; }; + 523A371328CCF27400876C77 /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523A371228CCF27400876C77 /* AdServices.framework */; }; + 523A371528CCF28100876C77 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523A371428CCF28100876C77 /* StoreKit.framework */; }; + 523A371728CCF28900876C77 /* AppTrackingTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523A371628CCF28900876C77 /* AppTrackingTransparency.framework */; }; 52A0616C277CE114009FAB35 /* release-lite.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 52A06168277CE114009FAB35 /* release-lite.xcconfig */; }; 52A0616D277CE114009FAB35 /* release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 52A06169277CE114009FAB35 /* release.xcconfig */; }; 52A0616E277CE114009FAB35 /* debug-lite.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 52A0616A277CE114009FAB35 /* debug-lite.xcconfig */; }; @@ -53,6 +56,10 @@ 3A521F5B4DBE255885C9D679 /* Pods_OpenDocumentReaderTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenDocumentReaderTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B2DB65725CE9DAE177ABB91 /* Pods-OpenDocumentReaderTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReaderTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReaderTests/Pods-OpenDocumentReaderTests.debug.xcconfig"; sourceTree = ""; }; 481CC96FC0685A2908EBA9A3 /* Pods-OpenDocumentReader.release lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.release lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release lite.xcconfig"; sourceTree = ""; }; + 523A370E28CCF26B00876C77 /* Adjust.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Adjust.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 523A371228CCF27400876C77 /* AdServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdServices.framework; path = System/Library/Frameworks/AdServices.framework; sourceTree = SDKROOT; }; + 523A371428CCF28100876C77 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; + 523A371628CCF28900876C77 /* AppTrackingTransparency.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppTrackingTransparency.framework; path = System/Library/Frameworks/AppTrackingTransparency.framework; sourceTree = SDKROOT; }; 52A06168277CE114009FAB35 /* release-lite.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "release-lite.xcconfig"; sourceTree = ""; }; 52A06169277CE114009FAB35 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = ""; }; 52A0616A277CE114009FAB35 /* debug-lite.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "debug-lite.xcconfig"; sourceTree = ""; }; @@ -127,9 +134,12 @@ buildActionMask = 2147483647; files = ( E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */, + 523A371728CCF28900876C77 /* AppTrackingTransparency.framework in Frameworks */, + 523A371528CCF28100876C77 /* StoreKit.framework in Frameworks */, E23795302274844400BA7238 /* AdSupport.framework in Frameworks */, E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */, 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */, + 523A371328CCF27400876C77 /* AdServices.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -166,6 +176,10 @@ E2BB4B64220EF4F20056176B /* Frameworks */ = { isa = PBXGroup; children = ( + 523A371628CCF28900876C77 /* AppTrackingTransparency.framework */, + 523A371428CCF28100876C77 /* StoreKit.framework */, + 523A371228CCF27400876C77 /* AdServices.framework */, + 523A370E28CCF26B00876C77 /* Adjust.framework */, E2064DDF22CFA1BA006441F8 /* iAd.framework */, E237952F2274844400BA7238 /* AdSupport.framework */, E26C39382250DC6E009C484A /* WebKit.framework */, @@ -584,7 +598,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 36; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -595,7 +609,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.28; + MARKETING_VERSION = 1.29; PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -674,7 +688,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 36; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -685,7 +699,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.28; + MARKETING_VERSION = 1.29; PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -912,7 +926,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 36; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -923,7 +937,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.28; + MARKETING_VERSION = 1.29; PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -943,7 +957,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 36; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -954,7 +968,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.28; + MARKETING_VERSION = 1.29; PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; diff --git a/OpenDocumentReader/AppDelegate.swift b/OpenDocumentReader/AppDelegate.swift index b225cd3..32edc60 100644 --- a/OpenDocumentReader/AppDelegate.swift +++ b/OpenDocumentReader/AppDelegate.swift @@ -8,6 +8,7 @@ import UIKit import Firebase +import Adjust @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { @@ -26,6 +27,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate { StoreReviewHelper.incrementAppOpenedCount() + let adjustConfig = ADJConfig( + appToken: "6gm8nc5v9sw0", + environment: ADJEnvironmentProduction) + + Adjust.appDidLaunch(adjustConfig) + return true } diff --git a/OpenDocumentReader/BridgingHeader.h b/OpenDocumentReader/BridgingHeader.h index e502096..63a47ec 100644 --- a/OpenDocumentReader/BridgingHeader.h +++ b/OpenDocumentReader/BridgingHeader.h @@ -3,3 +3,5 @@ // #include "CoreWrapper.h" + +#import diff --git a/Podfile b/Podfile index 928bbcb..2334a8c 100644 --- a/Podfile +++ b/Podfile @@ -10,6 +10,7 @@ target 'OpenDocumentReader' do pod 'Google-Mobile-Ads-SDK' pod 'Firebase/Crashlytics' pod 'Firebase/Analytics' + pod 'Adjust' target 'OpenDocumentReaderTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index a90b79e..d61e887 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,19 +1,22 @@ PODS: - - Firebase/Analytics (9.4.0): + - Adjust (4.32.0): + - Adjust/Core (= 4.32.0) + - Adjust/Core (4.32.0) + - Firebase/Analytics (9.5.0): - Firebase/Core - - Firebase/Core (9.4.0): + - Firebase/Core (9.5.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.4.0) - - Firebase/CoreOnly (9.4.0): - - FirebaseCore (= 9.4.0) - - Firebase/Crashlytics (9.4.0): + - FirebaseAnalytics (~> 9.5.0) + - Firebase/CoreOnly (9.5.0): + - FirebaseCore (= 9.5.0) + - Firebase/Crashlytics (9.5.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 9.4.0) - - Firebase/Storage (9.4.0): + - FirebaseCrashlytics (~> 9.5.0) + - Firebase/Storage (9.5.0): - Firebase/CoreOnly - - FirebaseStorage (~> 9.4.0) - - FirebaseAnalytics (9.4.0): - - FirebaseAnalytics/AdIdSupport (= 9.4.0) + - FirebaseStorage (~> 9.5.0) + - FirebaseAnalytics (9.5.0): + - FirebaseAnalytics/AdIdSupport (= 9.5.0) - FirebaseCore (~> 9.0) - FirebaseInstallations (~> 9.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) @@ -21,70 +24,70 @@ PODS: - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.4.0): + - FirebaseAnalytics/AdIdSupport (9.5.0): - FirebaseCore (~> 9.0) - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.4.0) + - GoogleAppMeasurement (= 9.5.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAppCheckInterop (9.4.0) - - FirebaseAuthInterop (9.4.0) - - FirebaseCore (9.4.0): + - FirebaseAppCheckInterop (9.5.0) + - FirebaseAuthInterop (9.5.0) + - FirebaseCore (9.5.0): - FirebaseCoreDiagnostics (~> 9.0) - FirebaseCoreInternal (~> 9.0) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.4.0): + - FirebaseCoreDiagnostics (9.5.0): - GoogleDataTransport (< 10.0.0, >= 9.1.4) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/Logger (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreExtension (9.4.0): + - FirebaseCoreExtension (9.5.0): - FirebaseCore (~> 9.0) - - FirebaseCoreInternal (9.4.0): + - FirebaseCoreInternal (9.5.0): - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseCrashlytics (9.4.0): + - FirebaseCrashlytics (9.5.0): - FirebaseCore (~> 9.0) - FirebaseInstallations (~> 9.0) - GoogleDataTransport (< 10.0.0, >= 9.1.4) - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseInstallations (9.4.0): + - FirebaseInstallations (9.5.0): - FirebaseCore (~> 9.0) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/UserDefaults (~> 7.7) - PromisesObjC (~> 2.1) - - FirebaseStorage (9.4.0): + - FirebaseStorage (9.5.0): - FirebaseAppCheckInterop (~> 9.0) - FirebaseAuthInterop (~> 9.0) - FirebaseCore (~> 9.0) - FirebaseCoreExtension (~> 9.0) - FirebaseStorageInternal (~> 9.0) - - FirebaseStorageInternal (9.4.0): + - FirebaseStorageInternal (9.5.0): - FirebaseCore (~> 9.0) - - GTMSessionFetcher/Core (< 3.0, >= 1.7) - - Google-Mobile-Ads-SDK (9.9.0): + - GTMSessionFetcher/Core (< 2.1, >= 1.7) + - Google-Mobile-Ads-SDK (9.10.0): - GoogleAppMeasurement (< 10.0, >= 7.0) - GoogleUserMessagingPlatform (>= 1.1) - - GoogleAppMeasurement (9.4.0): - - GoogleAppMeasurement/AdIdSupport (= 9.4.0) + - GoogleAppMeasurement (9.5.0): + - GoogleAppMeasurement/AdIdSupport (= 9.5.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.4.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.4.0) + - GoogleAppMeasurement/AdIdSupport (9.5.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 9.5.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.4.0): + - GoogleAppMeasurement/WithoutAdIdSupport (9.5.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) @@ -124,6 +127,7 @@ PODS: - ScrollableSegmentedControl (1.5.0) DEPENDENCIES: + - Adjust - Firebase/Analytics - Firebase/Core - Firebase/Crashlytics @@ -133,6 +137,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - Adjust - Firebase - FirebaseAnalytics - FirebaseAppCheckInterop @@ -156,20 +161,21 @@ SPEC REPOS: - ScrollableSegmentedControl SPEC CHECKSUMS: - Firebase: 7703fc4022824b6d6db1bf7bea58d13b8e17ec46 - FirebaseAnalytics: a1a24e72b7ba7f47045a4633f1abb545c07bd29c - FirebaseAppCheckInterop: 63119cdfc94b16c3e9421513c17f597aee2ea225 - FirebaseAuthInterop: 826d3d772b554e3675ceaab8c665008277ca9d1c - FirebaseCore: 9a2b10270a854731c4d4d8a97d0aa8380ec3458d - FirebaseCoreDiagnostics: aaa87098082c4d4bdd1a9557b1186d18ca85ce8c - FirebaseCoreExtension: 2cf8c542b54ad3c2d4b746c22e8828b670dcd9b0 - FirebaseCoreInternal: a13302b0088fbf5f38b79b6ece49c2af7d3e05d6 - FirebaseCrashlytics: 121ea1d37f4906c94c4c9307297af5121b98b789 - FirebaseInstallations: 61db1054e688d2bdc4e2b3f744c1b086e913b742 - FirebaseStorage: 160ba975dd3452d9c59a3bf5ea9bf70ff96bd3c2 - FirebaseStorageInternal: 425c7dc7de44d9b7e07a9f8d6515bab0f1266b87 - Google-Mobile-Ads-SDK: 8822993da940ab920bad131b5bffce7eb3f62c6a - GoogleAppMeasurement: 5d69e04287fc2c10cc43724bfa4bf31fc12c3dff + Adjust: d537f6d943f536d801ff8d07a971461539ce1fc5 + Firebase: 800f16f07af493d98d017446a315c27af0552f41 + FirebaseAnalytics: 1b60984a408320dda637306f3f733699ef8473d7 + FirebaseAppCheckInterop: 8e95b4329809e3c06fb425acb3839dcadfe23673 + FirebaseAuthInterop: c5aa97b55a87785e22c60c73996c1ad32e5f7ac9 + FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f + FirebaseCoreDiagnostics: 17cbf4e72b1dbd64bfdc33d4b1f07bce4f16f1d8 + FirebaseCoreExtension: 2904492b693a6871ddbd1088c9d1fe6e54384050 + FirebaseCoreInternal: 50a8e39cae8abf72d5145d07ea34c3244f70862b + FirebaseCrashlytics: d20fa38bb8c88cb0f1c9211286bc23ab58c1b464 + FirebaseInstallations: 41f811b530c41dd90973d0174381cdb3fcb5e839 + FirebaseStorage: a806d9f9eededf6fb1d906e79221b83ada1dbb4f + FirebaseStorageInternal: 4f8a9e27391a99ac0692adbbd072fe0e5c4125fe + Google-Mobile-Ads-SDK: eb398023f0d97cdd259b171052f1eb433de00c87 + GoogleAppMeasurement: 6ee231473fbd75c11221dfce489894334024eead GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 @@ -178,6 +184,6 @@ SPEC CHECKSUMS: PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb ScrollableSegmentedControl: 2e64bbe8968a7fcd8aae5014434481464fcdfe60 -PODFILE CHECKSUM: 55a033d715a08541580f2abd7fcc12a2d724614e +PODFILE CHECKSUM: a53aa52a4e29bcf5b37f45cd29783efd472925e1 COCOAPODS: 1.11.3 From 8c2fd5cb1ff1431880a665d0428d66c7a7e5d82a Mon Sep 17 00:00:00 2001 From: Test Date: Wed, 14 Sep 2022 06:12:15 +0200 Subject: [PATCH 2/4] add adjust to Pro --- OpenDocumentReader.xcodeproj/project.pbxproj | 16 ++++++++-------- OpenDocumentReader/AppDelegate.swift | 15 +++++++++++---- OpenDocumentReader/Info-Lite.plist | 2 ++ OpenDocumentReader/Info.plist | 2 ++ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index e6fb382..d1181ef 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -598,7 +598,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 36; + CURRENT_PROJECT_VERSION = 37; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -609,7 +609,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.29; + MARKETING_VERSION = 1.30; PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -688,7 +688,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 36; + CURRENT_PROJECT_VERSION = 37; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -699,7 +699,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.29; + MARKETING_VERSION = 1.30; PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -926,7 +926,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 36; + CURRENT_PROJECT_VERSION = 37; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -937,7 +937,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.29; + MARKETING_VERSION = 1.30; PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -957,7 +957,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 36; + CURRENT_PROJECT_VERSION = 37; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -968,7 +968,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.29; + MARKETING_VERSION = 1.30; PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; diff --git a/OpenDocumentReader/AppDelegate.swift b/OpenDocumentReader/AppDelegate.swift index 32edc60..e99756e 100644 --- a/OpenDocumentReader/AppDelegate.swift +++ b/OpenDocumentReader/AppDelegate.swift @@ -27,11 +27,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate { StoreReviewHelper.incrementAppOpenedCount() - let adjustConfig = ADJConfig( - appToken: "6gm8nc5v9sw0", - environment: ADJEnvironmentProduction) + let adjustKey = Bundle.main.object(forInfoDictionaryKey: "ADJUST_KEY") as? String; + if (adjustKey != nil) { + let adjustConfig = ADJConfig( + appToken: adjustKey!, + environment: ADJEnvironmentProduction) - Adjust.appDidLaunch(adjustConfig) + Adjust.appDidLaunch(adjustConfig) + + if ConfigurationManager.manager.configuration == .full { + Adjust.disableThirdPartySharing(); + } + } return true } diff --git a/OpenDocumentReader/Info-Lite.plist b/OpenDocumentReader/Info-Lite.plist index 7694fe3..edda01e 100644 --- a/OpenDocumentReader/Info-Lite.plist +++ b/OpenDocumentReader/Info-Lite.plist @@ -91,5 +91,7 @@ cstr6suwn9.skadnetwork + ADJUST_KEY + 6gm8nc5v9sw0 diff --git a/OpenDocumentReader/Info.plist b/OpenDocumentReader/Info.plist index 5a37ec5..0c493e5 100644 --- a/OpenDocumentReader/Info.plist +++ b/OpenDocumentReader/Info.plist @@ -2,6 +2,8 @@ + ADJUST_KEY + kzcfrb4pui2o CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDocumentTypes From cfc85e14bcd68def2dddc2f788f9a6b2d8cd30e1 Mon Sep 17 00:00:00 2001 From: Test Date: Sun, 20 Aug 2023 16:31:12 +0200 Subject: [PATCH 3/4] update dependencies --- OpenDocumentReader/CoreWrapper.mm | 14 +- Podfile.lock | 234 +++++++++++++++--------------- conanfile.txt | 2 +- 3 files changed, 126 insertions(+), 124 deletions(-) diff --git a/OpenDocumentReader/CoreWrapper.mm b/OpenDocumentReader/CoreWrapper.mm index 5ac1724..daf6d7e 100644 --- a/OpenDocumentReader/CoreWrapper.mm +++ b/OpenDocumentReader/CoreWrapper.mm @@ -14,13 +14,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include @implementation CoreWrapper { std::optional html; diff --git a/Podfile.lock b/Podfile.lock index d61e887..3358574 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,129 +1,131 @@ PODS: - - Adjust (4.32.0): - - Adjust/Core (= 4.32.0) - - Adjust/Core (4.32.0) - - Firebase/Analytics (9.5.0): + - Adjust (4.34.1): + - Adjust/Core (= 4.34.1) + - Adjust/Core (4.34.1) + - Firebase/Analytics (10.13.0): - Firebase/Core - - Firebase/Core (9.5.0): + - Firebase/Core (10.13.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.5.0) - - Firebase/CoreOnly (9.5.0): - - FirebaseCore (= 9.5.0) - - Firebase/Crashlytics (9.5.0): + - FirebaseAnalytics (~> 10.13.0) + - Firebase/CoreOnly (10.13.0): + - FirebaseCore (= 10.13.0) + - Firebase/Crashlytics (10.13.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 9.5.0) - - Firebase/Storage (9.5.0): + - FirebaseCrashlytics (~> 10.13.0) + - Firebase/Storage (10.13.0): - Firebase/CoreOnly - - FirebaseStorage (~> 9.5.0) - - FirebaseAnalytics (9.5.0): - - FirebaseAnalytics/AdIdSupport (= 9.5.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseStorage (~> 10.13.0) + - FirebaseAnalytics (10.13.0): + - FirebaseAnalytics/AdIdSupport (= 10.13.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.5.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.5.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseAnalytics/AdIdSupport (10.13.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.13.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAppCheckInterop (9.5.0) - - FirebaseAuthInterop (9.5.0) - - FirebaseCore (9.5.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.5.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreExtension (9.5.0): - - FirebaseCore (~> 9.0) - - FirebaseCoreInternal (9.5.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseCrashlytics (9.5.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) + - FirebaseAppCheckInterop (10.13.0) + - FirebaseAuthInterop (10.13.0) + - FirebaseCore (10.13.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.13.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.13.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.13.0): + - FirebaseCore (~> 10.5) + - FirebaseInstallations (~> 10.0) + - FirebaseSessions (~> 10.5) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseInstallations (9.5.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseInstallations (10.13.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseStorage (9.5.0): - - FirebaseAppCheckInterop (~> 9.0) - - FirebaseAuthInterop (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseCoreExtension (~> 9.0) - - FirebaseStorageInternal (~> 9.0) - - FirebaseStorageInternal (9.5.0): - - FirebaseCore (~> 9.0) - - GTMSessionFetcher/Core (< 2.1, >= 1.7) - - Google-Mobile-Ads-SDK (9.10.0): - - GoogleAppMeasurement (< 10.0, >= 7.0) + - FirebaseSessions (10.13.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.10) + - nanopb (< 2.30910.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) + - FirebaseStorage (10.13.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - Google-Mobile-Ads-SDK (10.9.0): + - GoogleAppMeasurement (< 11.0, >= 7.0) - GoogleUserMessagingPlatform (>= 1.1) - - GoogleAppMeasurement (9.5.0): - - GoogleAppMeasurement/AdIdSupport (= 9.5.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement (10.13.0): + - GoogleAppMeasurement/AdIdSupport (= 10.13.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.5.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.5.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/AdIdSupport (10.13.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.13.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.5.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/WithoutAdIdSupport (10.13.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.0): + - GoogleDataTransport (9.2.5): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUserMessagingPlatform (2.0.0) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUserMessagingPlatform (2.1.0) + - GoogleUtilities/AppDelegateSwizzler (7.11.5): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.11.5): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.11.5): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): + - GoogleUtilities/MethodSwizzler (7.11.5): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.11.5): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.11.5)" + - GoogleUtilities/Reachability (7.11.5): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.11.5): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (2.0.0) + - GTMSessionFetcher/Core (3.1.1) - nanopb (2.30909.0): - nanopb/decode (= 2.30909.0) - nanopb/encode (= 2.30909.0) - nanopb/decode (2.30909.0) - nanopb/encode (2.30909.0) - - PromisesObjC (2.1.1) + - PromisesObjC (2.3.1) + - PromisesSwift (2.3.1): + - PromisesObjC (= 2.3.1) - ScrollableSegmentedControl (1.5.0) DEPENDENCIES: @@ -143,13 +145,12 @@ SPEC REPOS: - FirebaseAppCheckInterop - FirebaseAuthInterop - FirebaseCore - - FirebaseCoreDiagnostics - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseInstallations + - FirebaseSessions - FirebaseStorage - - FirebaseStorageInternal - Google-Mobile-Ads-SDK - GoogleAppMeasurement - GoogleDataTransport @@ -158,32 +159,33 @@ SPEC REPOS: - GTMSessionFetcher - nanopb - PromisesObjC + - PromisesSwift - ScrollableSegmentedControl SPEC CHECKSUMS: - Adjust: d537f6d943f536d801ff8d07a971461539ce1fc5 - Firebase: 800f16f07af493d98d017446a315c27af0552f41 - FirebaseAnalytics: 1b60984a408320dda637306f3f733699ef8473d7 - FirebaseAppCheckInterop: 8e95b4329809e3c06fb425acb3839dcadfe23673 - FirebaseAuthInterop: c5aa97b55a87785e22c60c73996c1ad32e5f7ac9 - FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f - FirebaseCoreDiagnostics: 17cbf4e72b1dbd64bfdc33d4b1f07bce4f16f1d8 - FirebaseCoreExtension: 2904492b693a6871ddbd1088c9d1fe6e54384050 - FirebaseCoreInternal: 50a8e39cae8abf72d5145d07ea34c3244f70862b - FirebaseCrashlytics: d20fa38bb8c88cb0f1c9211286bc23ab58c1b464 - FirebaseInstallations: 41f811b530c41dd90973d0174381cdb3fcb5e839 - FirebaseStorage: a806d9f9eededf6fb1d906e79221b83ada1dbb4f - FirebaseStorageInternal: 4f8a9e27391a99ac0692adbbd072fe0e5c4125fe - Google-Mobile-Ads-SDK: eb398023f0d97cdd259b171052f1eb433de00c87 - GoogleAppMeasurement: 6ee231473fbd75c11221dfce489894334024eead - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - GTMSessionFetcher: 681175626052e03fdde7952f7e9c7a9785719506 + Adjust: 1410b6ccbce29c91b8e88064186a7b103244fa43 + Firebase: 343d7539befb614d22b2eae24759f6307b1175e9 + FirebaseAnalytics: 9a12e090ead49f8877ed8132ae920e3cbbd2fcd0 + FirebaseAppCheckInterop: 5e12dc623d443dedffcde9c6f3ed41510125d8ef + FirebaseAuthInterop: 74875bde5d15636522a8fe98beb561df7a54db58 + FirebaseCore: 9948a31ff2c6cf323f9b040068201a95d271b68d + FirebaseCoreExtension: ce60f9db46d83944cf444664d6d587474128eeca + FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e + FirebaseCrashlytics: 4679fbc4768fcb4dd6f5533101841d40256d4475 + FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f + FirebaseSessions: 991fb4c20b3505eef125f7cbfa20a5b5b189c2a4 + FirebaseStorage: f2d1a84d78a7226d97bc76d85cf1092cab5f2b7d + Google-Mobile-Ads-SDK: e81e8b009a182dc8dd14951782efdbb30a5e4510 + GoogleAppMeasurement: 3ae505b44174bcc0775f5c86cecc5826259fbb1e + GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 + GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf + GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 + GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb + PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 + PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265 ScrollableSegmentedControl: 2e64bbe8968a7fcd8aae5014434481464fcdfe60 PODFILE CHECKSUM: a53aa52a4e29bcf5b37f45cd29783efd472925e1 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/conanfile.txt b/conanfile.txt index 79dd482..c6bcd30 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -odrcore/2.1.2@ +odrcore/3.0.0@ [generators] xcode From bb8eba6c944c5aa52656ec3c53cece8e5576b6ee Mon Sep 17 00:00:00 2001 From: Test Date: Sun, 20 Aug 2023 17:22:50 +0200 Subject: [PATCH 4/4] cleanup --- OpenDocumentReader.xcodeproj/project.pbxproj | 186 +++++++++++++----- OpenDocumentReader/AppDelegate.swift | 14 -- OpenDocumentReader/BridgingHeader.h | 2 - OpenDocumentReader/Document.swift | 9 +- .../DocumentBrowserViewController.swift | 3 +- .../DocumentViewController.swift | 3 +- OpenDocumentReader/Info-Lite.plist | 2 - OpenDocumentReader/Info.plist | 2 - Podfile | 10 +- Podfile.lock | 8 +- 10 files changed, 156 insertions(+), 83 deletions(-) diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index d1181ef..2c188f9 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */; }; + 22E10F353A0C09E10812EDAC /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AB0A593247807A3F41DFA /* Pods_OpenDocumentReader.framework */; }; 523A371328CCF27400876C77 /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523A371228CCF27400876C77 /* AdServices.framework */; }; 523A371528CCF28100876C77 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523A371428CCF28100876C77 /* StoreKit.framework */; }; 523A371728CCF28900876C77 /* AppTrackingTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523A371628CCF28900876C77 /* AppTrackingTransparency.framework */; }; @@ -15,7 +15,8 @@ 52A0616D277CE114009FAB35 /* release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 52A06169277CE114009FAB35 /* release.xcconfig */; }; 52A0616E277CE114009FAB35 /* debug-lite.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 52A0616A277CE114009FAB35 /* debug-lite.xcconfig */; }; 52A0616F277CE114009FAB35 /* debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 52A0616B277CE114009FAB35 /* debug.xcconfig */; }; - 57144585DF3CE1452E955630 /* Pods_OpenDocumentReaderTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A521F5B4DBE255885C9D679 /* Pods_OpenDocumentReaderTests.framework */; }; + 52A348B42A92635E00DACAB9 /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A348B32A92635E00DACAB9 /* Pods_OpenDocumentReader.framework */; }; + 52DE0FAF45FE38FFAE9E4910 /* Pods_OpenDocumentReaderTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559CD8DFE3C657DEB311030B /* Pods_OpenDocumentReaderTests.framework */; }; AC125F162435311A008AD515 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AC125F182435311A008AD515 /* Localizable.strings */; }; AC384BCD23B4FFA700C7BF47 /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BC923B4FFA700C7BF47 /* ContentViewController.swift */; }; AC384BCE23B4FFA700C7BF47 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCA23B4FFA700C7BF47 /* Constants.swift */; }; @@ -53,10 +54,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 3A521F5B4DBE255885C9D679 /* Pods_OpenDocumentReaderTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenDocumentReaderTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B2DB65725CE9DAE177ABB91 /* Pods-OpenDocumentReaderTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReaderTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReaderTests/Pods-OpenDocumentReaderTests.debug.xcconfig"; sourceTree = ""; }; 481CC96FC0685A2908EBA9A3 /* Pods-OpenDocumentReader.release lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.release lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release lite.xcconfig"; sourceTree = ""; }; - 523A370E28CCF26B00876C77 /* Adjust.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Adjust.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 523A371228CCF27400876C77 /* AdServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdServices.framework; path = System/Library/Frameworks/AdServices.framework; sourceTree = SDKROOT; }; 523A371428CCF28100876C77 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 523A371628CCF28900876C77 /* AppTrackingTransparency.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppTrackingTransparency.framework; path = System/Library/Frameworks/AppTrackingTransparency.framework; sourceTree = SDKROOT; }; @@ -64,7 +63,11 @@ 52A06169277CE114009FAB35 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = ""; }; 52A0616A277CE114009FAB35 /* debug-lite.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "debug-lite.xcconfig"; sourceTree = ""; }; 52A0616B277CE114009FAB35 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = ""; }; - 9486CF1B73BC18A67EE4DB5B /* Pods-OpenDocumentReader.full.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.full.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.full.xcconfig"; sourceTree = ""; }; + 52A348B12A9262D100DACAB9 /* OpenDocumentReader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenDocumentReader.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 52A348B22A9262D100DACAB9 /* OpenDocumentReaderTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenDocumentReaderTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 52A348B32A92635E00DACAB9 /* Pods_OpenDocumentReader.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Pods_OpenDocumentReader.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 52A348B72A9266BB00DACAB9 /* conanbuildinfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = conanbuildinfo.xcconfig; sourceTree = ""; }; + 559CD8DFE3C657DEB311030B /* Pods_OpenDocumentReaderTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenDocumentReaderTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 97704690541D85438FC2079C /* Pods-OpenDocumentReader.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.release.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release.xcconfig"; sourceTree = ""; }; A3BBE33791EBF379139575AB /* Pods-OpenDocumentReaderTests.release lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReaderTests.release lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReaderTests/Pods-OpenDocumentReaderTests.release lite.xcconfig"; sourceTree = ""; }; AC125F172435311A008AD515 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -93,8 +96,8 @@ B3FCFC99F5757D71C0A3EB11 /* Pods-OpenDocumentReader.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug.xcconfig"; sourceTree = ""; }; C39C76F36758805489D19A8D /* Pods-OpenDocumentReader.debug lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug lite.xcconfig"; sourceTree = ""; }; D7F1C22195A1CA95F6A6DEF4 /* Pods-OpenDocumentReaderTests.debug lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReaderTests.debug lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReaderTests/Pods-OpenDocumentReaderTests.debug lite.xcconfig"; sourceTree = ""; }; + DF0AB0A593247807A3F41DFA /* Pods_OpenDocumentReader.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenDocumentReader.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; }; - E22B252C2557F0E2001D0C52 /* OpenDocumentReaderTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenDocumentReaderTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E22B252E2557F0E2001D0C52 /* OpenDocumentReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenDocumentReaderTests.swift; sourceTree = ""; }; E22B25302557F0E2001D0C52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentBrowserTransitioningDelegate.swift; sourceTree = ""; }; @@ -109,14 +112,11 @@ E2C008F9220F1CF80097C594 /* CoreWrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CoreWrapper.mm; sourceTree = ""; }; E2C008FC220F1D570097C594 /* CoreWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreWrapper.h; sourceTree = ""; }; E2D0B3D8226D945400534FCC /* StoreReviewHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreReviewHelper.swift; sourceTree = ""; }; - E2F7ED4F220B54D600D63515 /* OpenDocumentReader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenDocumentReader.app; sourceTree = BUILT_PRODUCTS_DIR; }; E2F7ED52220B54D600D63515 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; E2F7ED54220B54D600D63515 /* DocumentBrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentBrowserViewController.swift; sourceTree = ""; }; E2F7ED5D220B54D700D63515 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; E2F7ED60220B54D700D63515 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; E2F7ED62220B54D700D63515 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenDocumentReader.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F0AFB82E80A876C70BD198AC /* Pods-OpenDocumentReader.lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.lite.xcconfig"; sourceTree = ""; }; F441BA4458128EC8A16A91C9 /* Pods-OpenDocumentReaderTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReaderTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReaderTests/Pods-OpenDocumentReaderTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -125,7 +125,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 57144585DF3CE1452E955630 /* Pods_OpenDocumentReaderTests.framework in Frameworks */, + 52DE0FAF45FE38FFAE9E4910 /* Pods_OpenDocumentReaderTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -135,11 +135,12 @@ files = ( E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */, 523A371728CCF28900876C77 /* AppTrackingTransparency.framework in Frameworks */, + 52A348B42A92635E00DACAB9 /* Pods_OpenDocumentReader.framework in Frameworks */, 523A371528CCF28100876C77 /* StoreKit.framework in Frameworks */, E23795302274844400BA7238 /* AdSupport.framework in Frameworks */, E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */, - 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */, 523A371328CCF27400876C77 /* AdServices.framework in Frameworks */, + 22E10F353A0C09E10812EDAC /* Pods_OpenDocumentReader.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -151,8 +152,6 @@ children = ( B3FCFC99F5757D71C0A3EB11 /* Pods-OpenDocumentReader.debug.xcconfig */, 97704690541D85438FC2079C /* Pods-OpenDocumentReader.release.xcconfig */, - F0AFB82E80A876C70BD198AC /* Pods-OpenDocumentReader.lite.xcconfig */, - 9486CF1B73BC18A67EE4DB5B /* Pods-OpenDocumentReader.full.xcconfig */, C39C76F36758805489D19A8D /* Pods-OpenDocumentReader.debug lite.xcconfig */, 481CC96FC0685A2908EBA9A3 /* Pods-OpenDocumentReader.release lite.xcconfig */, 3B2DB65725CE9DAE177ABB91 /* Pods-OpenDocumentReaderTests.debug.xcconfig */, @@ -176,15 +175,15 @@ E2BB4B64220EF4F20056176B /* Frameworks */ = { isa = PBXGroup; children = ( + 52A348B32A92635E00DACAB9 /* Pods_OpenDocumentReader.framework */, 523A371628CCF28900876C77 /* AppTrackingTransparency.framework */, 523A371428CCF28100876C77 /* StoreKit.framework */, 523A371228CCF27400876C77 /* AdServices.framework */, - 523A370E28CCF26B00876C77 /* Adjust.framework */, E2064DDF22CFA1BA006441F8 /* iAd.framework */, E237952F2274844400BA7238 /* AdSupport.framework */, E26C39382250DC6E009C484A /* WebKit.framework */, - EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */, - 3A521F5B4DBE255885C9D679 /* Pods_OpenDocumentReaderTests.framework */, + DF0AB0A593247807A3F41DFA /* Pods_OpenDocumentReader.framework */, + 559CD8DFE3C657DEB311030B /* Pods_OpenDocumentReaderTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -196,23 +195,16 @@ 52A0616B277CE114009FAB35 /* debug.xcconfig */, 52A06168277CE114009FAB35 /* release-lite.xcconfig */, 52A06169277CE114009FAB35 /* release.xcconfig */, + 52A348B72A9266BB00DACAB9 /* conanbuildinfo.xcconfig */, E2F7ED51220B54D600D63515 /* OpenDocumentReader */, E22B252D2557F0E2001D0C52 /* OpenDocumentReaderTests */, - E2F7ED50220B54D600D63515 /* Products */, E2BB4B64220EF4F20056176B /* Frameworks */, E20D24999F878FB3AAE258B3 /* Pods */, + 52A348B12A9262D100DACAB9 /* OpenDocumentReader.app */, + 52A348B22A9262D100DACAB9 /* OpenDocumentReaderTests.xctest */, ); sourceTree = ""; }; - E2F7ED50220B54D600D63515 /* Products */ = { - isa = PBXGroup; - children = ( - E2F7ED4F220B54D600D63515 /* OpenDocumentReader.app */, - E22B252C2557F0E2001D0C52 /* OpenDocumentReaderTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; E2F7ED51220B54D600D63515 /* OpenDocumentReader */ = { isa = PBXGroup; children = ( @@ -261,7 +253,7 @@ ); name = OpenDocumentReaderTests; productName = OpenDocumentReaderTests; - productReference = E22B252C2557F0E2001D0C52 /* OpenDocumentReaderTests.xctest */; + productReference = 52A348B22A9262D100DACAB9 /* OpenDocumentReaderTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; E2F7ED4E220B54D600D63515 /* OpenDocumentReader */ = { @@ -281,7 +273,7 @@ ); name = OpenDocumentReader; productName = "OpenDocument Reader"; - productReference = E2F7ED4F220B54D600D63515 /* OpenDocumentReader.app */; + productReference = 52A348B12A9262D100DACAB9 /* OpenDocumentReader.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -328,7 +320,7 @@ sl, ); mainGroup = E2F7ED46220B54D600D63515; - productRefGroup = E2F7ED50220B54D600D63515 /* Products */; + productRefGroup = E2F7ED46220B54D600D63515; projectDirPath = ""; projectRoot = ""; targets = ( @@ -576,7 +568,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -598,18 +590,44 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 37; + CURRENT_PROJECT_VERSION = 38; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; + ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "OpenDocumentReader/Info-Lite.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.30; + MARKETING_VERSION = 1.31; + OTHER_CFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_CPLUSPLUSFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + "-lodr", + "-lpugixml", + "-lcryptopp", + "-lminiz", + "-luchardet", + ); PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -666,7 +684,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -688,18 +706,44 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 37; + CURRENT_PROJECT_VERSION = 38; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; + ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "OpenDocumentReader/Info-Lite.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.30; + MARKETING_VERSION = 1.31; + OTHER_CFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_CPLUSPLUSFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + "-lodr", + "-lpugixml", + "-lcryptopp", + "-lminiz", + "-luchardet", + ); PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -845,7 +889,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -904,7 +948,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -926,18 +970,44 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 37; + CURRENT_PROJECT_VERSION = 38; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; + ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = OpenDocumentReader/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.30; + MARKETING_VERSION = 1.31; + OTHER_CFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_CPLUSPLUSFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + "-lodr", + "-lpugixml", + "-lcryptopp", + "-lminiz", + "-luchardet", + ); PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -957,18 +1027,44 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 37; + CURRENT_PROJECT_VERSION = 38; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5LS6X97G6J; + ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = OpenDocumentReader/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.30; + MARKETING_VERSION = 1.31; + OTHER_CFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_CPLUSPLUSFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", + "-arch", + arm64, + "-lodr", + "-lpugixml", + "-lcryptopp", + "-lminiz", + "-luchardet", + ); PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; diff --git a/OpenDocumentReader/AppDelegate.swift b/OpenDocumentReader/AppDelegate.swift index e99756e..b225cd3 100644 --- a/OpenDocumentReader/AppDelegate.swift +++ b/OpenDocumentReader/AppDelegate.swift @@ -8,7 +8,6 @@ import UIKit import Firebase -import Adjust @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { @@ -27,19 +26,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { StoreReviewHelper.incrementAppOpenedCount() - let adjustKey = Bundle.main.object(forInfoDictionaryKey: "ADJUST_KEY") as? String; - if (adjustKey != nil) { - let adjustConfig = ADJConfig( - appToken: adjustKey!, - environment: ADJEnvironmentProduction) - - Adjust.appDidLaunch(adjustConfig) - - if ConfigurationManager.manager.configuration == .full { - Adjust.disableThirdPartySharing(); - } - } - return true } diff --git a/OpenDocumentReader/BridgingHeader.h b/OpenDocumentReader/BridgingHeader.h index 63a47ec..e502096 100644 --- a/OpenDocumentReader/BridgingHeader.h +++ b/OpenDocumentReader/BridgingHeader.h @@ -3,5 +3,3 @@ // #include "CoreWrapper.h" - -#import diff --git a/OpenDocumentReader/Document.swift b/OpenDocumentReader/Document.swift index 84d3cf6..bacbc2c 100644 --- a/OpenDocumentReader/Document.swift +++ b/OpenDocumentReader/Document.swift @@ -1,13 +1,6 @@ -/* -See LICENSE folder for this sample’s licensing information. - -Abstract: -A document that manages UTF8 text files. -*/ - import UIKit import WebKit -import Firebase +import FirebaseCrashlytics protocol DocumentDelegate: class { func documentUpdateContent(_ doc: Document) diff --git a/OpenDocumentReader/DocumentBrowserViewController.swift b/OpenDocumentReader/DocumentBrowserViewController.swift index eb8524d..fda3f20 100644 --- a/OpenDocumentReader/DocumentBrowserViewController.swift +++ b/OpenDocumentReader/DocumentBrowserViewController.swift @@ -6,7 +6,8 @@ */ import UIKit -import Firebase +import FirebaseCrashlytics +import FirebaseAnalytics class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocumentBrowserViewControllerDelegate { diff --git a/OpenDocumentReader/DocumentViewController.swift b/OpenDocumentReader/DocumentViewController.swift index 0e6c80b..f26b446 100644 --- a/OpenDocumentReader/DocumentViewController.swift +++ b/OpenDocumentReader/DocumentViewController.swift @@ -9,7 +9,8 @@ import UIKit import WebKit import ScrollableSegmentedControl import UIKit.UIPrinter -import Firebase +import FirebaseAnalytics +import FirebaseCrashlytics import GoogleMobileAds import AppTrackingTransparency import AdSupport diff --git a/OpenDocumentReader/Info-Lite.plist b/OpenDocumentReader/Info-Lite.plist index edda01e..7694fe3 100644 --- a/OpenDocumentReader/Info-Lite.plist +++ b/OpenDocumentReader/Info-Lite.plist @@ -91,7 +91,5 @@ cstr6suwn9.skadnetwork - ADJUST_KEY - 6gm8nc5v9sw0 diff --git a/OpenDocumentReader/Info.plist b/OpenDocumentReader/Info.plist index 0c493e5..5a37ec5 100644 --- a/OpenDocumentReader/Info.plist +++ b/OpenDocumentReader/Info.plist @@ -2,8 +2,6 @@ - ADJUST_KEY - kzcfrb4pui2o CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDocumentTypes diff --git a/Podfile b/Podfile index 2334a8c..69223a4 100644 --- a/Podfile +++ b/Podfile @@ -10,9 +10,17 @@ target 'OpenDocumentReader' do pod 'Google-Mobile-Ads-SDK' pod 'Firebase/Crashlytics' pod 'Firebase/Analytics' - pod 'Adjust' target 'OpenDocumentReaderTests' do inherit! :search_paths end end + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['ENABLE_BITCODE'] = 'NO' + end + end +end + diff --git a/Podfile.lock b/Podfile.lock index 3358574..e2afb49 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,7 +1,4 @@ PODS: - - Adjust (4.34.1): - - Adjust/Core (= 4.34.1) - - Adjust/Core (4.34.1) - Firebase/Analytics (10.13.0): - Firebase/Core - Firebase/Core (10.13.0): @@ -129,7 +126,6 @@ PODS: - ScrollableSegmentedControl (1.5.0) DEPENDENCIES: - - Adjust - Firebase/Analytics - Firebase/Core - Firebase/Crashlytics @@ -139,7 +135,6 @@ DEPENDENCIES: SPEC REPOS: trunk: - - Adjust - Firebase - FirebaseAnalytics - FirebaseAppCheckInterop @@ -163,7 +158,6 @@ SPEC REPOS: - ScrollableSegmentedControl SPEC CHECKSUMS: - Adjust: 1410b6ccbce29c91b8e88064186a7b103244fa43 Firebase: 343d7539befb614d22b2eae24759f6307b1175e9 FirebaseAnalytics: 9a12e090ead49f8877ed8132ae920e3cbbd2fcd0 FirebaseAppCheckInterop: 5e12dc623d443dedffcde9c6f3ed41510125d8ef @@ -186,6 +180,6 @@ SPEC CHECKSUMS: PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265 ScrollableSegmentedControl: 2e64bbe8968a7fcd8aae5014434481464fcdfe60 -PODFILE CHECKSUM: a53aa52a4e29bcf5b37f45cd29783efd472925e1 +PODFILE CHECKSUM: 35cd182dc790891ebc7626066c33a6e947e7167e COCOAPODS: 1.12.1