diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index f12a5f7b..11dcc7c7 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.1592 + 1.8.1593 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index c4480b5d..3d830098 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.1592 + 1.8.1593 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index d87dd80c..c99d6591 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -19,9 +19,7 @@ 970E7F811DA0305000741290 /* ControllerRetainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E7F7D1DA0305000741290 /* ControllerRetainer.swift */; }; 970E7F821DA0305000741290 /* TableOfContentsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E7F7E1DA0305000741290 /* TableOfContentsController.swift */; }; 970E7F831DA0305000741290 /* WelcomeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E7F7F1DA0305000741290 /* WelcomeController.swift */; }; - 9711871C1CEB448400B9909D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9711871B1CEB448400B9909D /* libz.tbd */; }; 9711871E1CEB449A00B9909D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9711871D1CEB449A00B9909D /* libz.tbd */; }; - 971187A91CEB694400B9909D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 971187A81CEB694400B9909D /* WebKit.framework */; }; 971A10161D022872007FC62C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 971A10151D022872007FC62C /* Assets.xcassets */; }; 971A101D1D0228E8007FC62C /* adjustlayoutiPad.js in Resources */ = {isa = PBXBuildFile; fileRef = 971A101A1D0228E8007FC62C /* adjustlayoutiPad.js */; }; 971A101E1D0228E8007FC62C /* adjustlayoutiPhone.js in Resources */ = {isa = PBXBuildFile; fileRef = 971A101B1D0228E8007FC62C /* adjustlayoutiPhone.js */; }; @@ -125,24 +123,9 @@ 97F03CE21D2440470040D26E /* Search.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97F03CE11D2440470040D26E /* Search.storyboard */; }; 97FD5CE71D3D90B7001C74A2 /* getSnippet.js in Resources */ = {isa = PBXBuildFile; fileRef = 97FD5CE61D3D90B7001C74A2 /* getSnippet.js */; }; 97FDACC41D85A3B300DEDACB /* Language+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6813E1D6F712800E5FA99 /* Language+CoreDataProperties.swift */; }; - EB1C0984A03359CD5CDC011C /* Pods_Kiwix_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 198ECFA618CDD6B29CD462A0 /* Pods_Kiwix_OSX.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 973BCCFD1CEB3FA500F10B44 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97A2AB801C1B80FF00052E74 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 973BCCE81CEB3FA400F10B44; - remoteInfo = "Kiwix-OSX"; - }; - 973BCD081CEB3FA500F10B44 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97A2AB801C1B80FF00052E74 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 973BCCE81CEB3FA400F10B44; - remoteInfo = "Kiwix-OSX"; - }; 9779C31C1D4575AE0064CC8E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 97A2AB801C1B80FF00052E74 /* Project object */; @@ -167,15 +150,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 971187211CEB4E6900B9909D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 97E609FF1D103DED00EBCB9D /* Embed App Extensions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -232,7 +206,6 @@ 9726591A1D8DB91200D1DFFB /* DownloadProgress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadProgress.swift; sourceTree = ""; }; 9726591C1D90A64500D1DFFB /* Notifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = ""; }; 9734E54D1D289D060061C39B /* Welcome.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Welcome.storyboard; path = "Kiwix-iOS/Storyboard/Welcome.storyboard"; sourceTree = SOURCE_ROOT; }; - 973BCCE91CEB3FA400F10B44 /* Kiwix.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Kiwix.app; sourceTree = BUILT_PRODUCTS_DIR; }; 973BCCFC1CEB3FA400F10B44 /* Kiwix-OSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Kiwix-OSXTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 973BCD001CEB3FA500F10B44 /* Kiwix_OSXTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Kiwix_OSXTests.swift; sourceTree = ""; }; 973BCD021CEB3FA500F10B44 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -340,16 +313,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 973BCCE61CEB3FA400F10B44 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 971187A91CEB694400B9909D /* WebKit.framework in Frameworks */, - 9711871C1CEB448400B9909D /* libz.tbd in Frameworks */, - EB1C0984A03359CD5CDC011C /* Pods_Kiwix_OSX.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 973BCCF91CEB3FA400F10B44 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -757,7 +720,6 @@ 97A2AB881C1B80FF00052E74 /* Kiwix.app */, 97A2AB9F1C1B80FF00052E74 /* Kiwix-iOSTests.xctest */, 97A2ABAA1C1B810000052E74 /* Kiwix-iOSUITests.xctest */, - 973BCCE91CEB3FA400F10B44 /* Kiwix.app */, 973BCCFC1CEB3FA400F10B44 /* Kiwix-OSXTests.xctest */, 973BCD071CEB3FA500F10B44 /* Kiwix-OSXUITests.xctest */, 9779C3131D4575AD0064CC8E /* Bookmarks.appex */, @@ -878,28 +840,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 973BCCE81CEB3FA400F10B44 /* Kiwix-OSX */ = { - isa = PBXNativeTarget; - buildConfigurationList = 973BCD0E1CEB3FA500F10B44 /* Build configuration list for PBXNativeTarget "Kiwix-OSX" */; - buildPhases = ( - 99B6C5B82907BC9766F6107C /* [CP] Check Pods Manifest.lock */, - 973BCCE51CEB3FA400F10B44 /* Sources */, - 973BCCE61CEB3FA400F10B44 /* Frameworks */, - 973BCCE71CEB3FA400F10B44 /* Resources */, - 971187211CEB4E6900B9909D /* CopyFiles */, - 97A4D7E31CF8C479006C731E /* ShellScript */, - 6386DDFA463FC9F4EBE2E419 /* [CP] Embed Pods Frameworks */, - CB1EEC1866DA4DFDA47B796E /* [CP] Copy Pods Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Kiwix-OSX"; - productName = "Kiwix-OSX"; - productReference = 973BCCE91CEB3FA400F10B44 /* Kiwix.app */; - productType = "com.apple.product-type.application"; - }; 973BCCFB1CEB3FA400F10B44 /* Kiwix-OSXTests */ = { isa = PBXNativeTarget; buildConfigurationList = 973BCD111CEB3FA500F10B44 /* Build configuration list for PBXNativeTarget "Kiwix-OSXTests" */; @@ -911,7 +851,6 @@ buildRules = ( ); dependencies = ( - 973BCCFE1CEB3FA500F10B44 /* PBXTargetDependency */, ); name = "Kiwix-OSXTests"; productName = "Kiwix-OSXTests"; @@ -929,7 +868,6 @@ buildRules = ( ); dependencies = ( - 973BCD091CEB3FA500F10B44 /* PBXTargetDependency */, ); name = "Kiwix-OSXUITests"; productName = "Kiwix-OSXUITests"; @@ -1023,9 +961,6 @@ LastUpgradeCheck = 0800; ORGANIZATIONNAME = Chris; TargetAttributes = { - 973BCCE81CEB3FA400F10B44 = { - CreatedOnToolsVersion = 7.3.1; - }; 973BCCFB1CEB3FA400F10B44 = { CreatedOnToolsVersion = 7.3.1; TestTargetID = 973BCCE81CEB3FA400F10B44; @@ -1088,7 +1023,6 @@ 97A2AB871C1B80FF00052E74 /* Kiwix-iOS */, 97A2AB9E1C1B80FF00052E74 /* Kiwix-iOSTests */, 97A2ABA91C1B810000052E74 /* Kiwix-iOSUITests */, - 973BCCE81CEB3FA400F10B44 /* Kiwix-OSX */, 973BCCFB1CEB3FA400F10B44 /* Kiwix-OSXTests */, 973BCD061CEB3FA500F10B44 /* Kiwix-OSXUITests */, 9779C3121D4575AD0064CC8E /* Bookmarks */, @@ -1097,13 +1031,6 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 973BCCE71CEB3FA400F10B44 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 973BCCFA1CEB3FA400F10B44 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1183,21 +1110,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Kiwix-iOS/Pods-Kiwix-iOS-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 6386DDFA463FC9F4EBE2E419 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Kiwix-OSX/Pods-Kiwix-OSX-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 7D32C417880EE3A4FFF4017C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1226,19 +1138,6 @@ shellPath = /bin/sh; shellScript = "#!/bin/bash\nbuildNumString=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nversionNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleShortVersionString\" \"$INFOPLIST_FILE\")\nIFS='.'; arr=($buildNumString)\nlastIndex=$((${#arr[@]} - 1))\nbuildNumber=$((${arr[lastIndex]} + 1))\nbuildNumString=\"${arr[0]}.${arr[1]}.$buildNumber\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumString\" \"$INFOPLIST_FILE\""; }; - 97A4D7E31CF8C479006C731E /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 12; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#!/bin/bash\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nbuildNumber=$(($buildNumber + 1))\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"$INFOPLIST_FILE\""; - }; 97FDACC31D859C3500DEDACB /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1252,36 +1151,6 @@ shellPath = /bin/sh; shellScript = "#!/bin/bash\nbuildNumString=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nversionNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleShortVersionString\" \"$INFOPLIST_FILE\")\nIFS='.'; arr=($buildNumString)\nlastIndex=$((${#arr[@]} - 1))\nbuildNumber=$((${arr[lastIndex]} + 1))\nbuildNumString=\"${arr[0]}.${arr[1]}.$buildNumber\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumString\" \"$INFOPLIST_FILE\""; }; - 99B6C5B82907BC9766F6107C /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - CB1EEC1866DA4DFDA47B796E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Kiwix-OSX/Pods-Kiwix-OSX-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; CDD21917A84F651D4CEFF569 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1300,13 +1169,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 973BCCE51CEB3FA400F10B44 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 973BCCF81CEB3FA400F10B44 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1434,16 +1296,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 973BCCFE1CEB3FA500F10B44 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 973BCCE81CEB3FA400F10B44 /* Kiwix-OSX */; - targetProxy = 973BCCFD1CEB3FA500F10B44 /* PBXContainerItemProxy */; - }; - 973BCD091CEB3FA500F10B44 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 973BCCE81CEB3FA400F10B44 /* Kiwix-OSX */; - targetProxy = 973BCD081CEB3FA500F10B44 /* PBXContainerItemProxy */; - }; 9779C31D1D4575AE0064CC8E /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9779C3121D4575AD0064CC8E /* Bookmarks */; @@ -1482,69 +1334,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 973BCD0F1CEB3FA500F10B44 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 6DCB0E958A1083CA248C5A12 /* Pods-Kiwix-OSX.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Kiwix/libkiwix/include", - "$(PROJECT_DIR)/Kiwix/libkiwix/C&C++", - "$(PROJECT_DIR)/Kiwix/libkiwix/", - ); - INFOPLIST_FILE = "Kiwix-OSX/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Kiwix/libkiwix/shared", - ); - MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = org.kiwix.osx; - PRODUCT_NAME = Kiwix; - SDKROOT = macosx; - SWIFT_OBJC_BRIDGING_HEADER = "Kiwix/Kiwix-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 973BCD101CEB3FA500F10B44 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 69E75DFE2EF83272AC5B02BA /* Pods-Kiwix-OSX.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Kiwix/libkiwix/include", - "$(PROJECT_DIR)/Kiwix/libkiwix/C&C++", - "$(PROJECT_DIR)/Kiwix/libkiwix/", - ); - INFOPLIST_FILE = "Kiwix-OSX/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Kiwix/libkiwix/shared", - ); - MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = org.kiwix.osx; - PRODUCT_NAME = Kiwix; - SDKROOT = macosx; - SWIFT_OBJC_BRIDGING_HEADER = "Kiwix/Kiwix-Bridging-Header.h"; - }; - name = Release; - }; 973BCD121CEB3FA500F10B44 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1870,15 +1659,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 973BCD0E1CEB3FA500F10B44 /* Build configuration list for PBXNativeTarget "Kiwix-OSX" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 973BCD0F1CEB3FA500F10B44 /* Debug */, - 973BCD101CEB3FA500F10B44 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 973BCD111CEB3FA500F10B44 /* Build configuration list for PBXNativeTarget "Kiwix-OSXTests" */ = { isa = XCConfigurationList; buildConfigurations = (