From ddc73181db5b4902b0a77bbc09f9a99c3d9ed591 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Thu, 19 Mar 2020 21:56:03 -0400 Subject: [PATCH 1/4] higher iOS and macOS compatibility version --- kiwixbuild/platforms/ios.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kiwixbuild/platforms/ios.py b/kiwixbuild/platforms/ios.py index c9da7f1..7f78f2b 100644 --- a/kiwixbuild/platforms/ios.py +++ b/kiwixbuild/platforms/ios.py @@ -9,7 +9,7 @@ class iOSPlatformInfo(PlatformInfo): build = 'iOS' static = True compatible_hosts = ['Darwin'] - min_iphoneos_version = '9.0' + min_iphoneos_version = '11.0' def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -49,7 +49,7 @@ class iOSPlatformInfo(PlatformInfo): def get_env(self): env = super().get_env() - env['MACOSX_DEPLOYMENT_TARGET'] = '10.10' + env['MACOSX_DEPLOYMENT_TARGET'] = '10.13' return env def set_comp_flags(self, env): From edc606aed0ed1d1505d736869dfd6d6f3f0e9e36 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Thu, 19 Mar 2020 21:56:29 -0400 Subject: [PATCH 2/4] remove platform options --- kiwixbuild/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiwixbuild/__init__.py b/kiwixbuild/__init__.py index b319eaa..f90f385 100644 --- a/kiwixbuild/__init__.py +++ b/kiwixbuild/__init__.py @@ -57,7 +57,7 @@ def parse_args(): if not options.android_arch: options.android_arch = ['arm', 'arm64', 'x86', 'x86_64'] if not options.ios_arch: - options.ios_arch = ['armv7', 'arm64', 'i386', 'x86_64'] + options.ios_arch = ['arm64', 'x86_64'] if not options.target_platform: if options.target in ('kiwix-lib-app',): From 23a682c52d319ea8fec4eac163f9a9df624dc247 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Sat, 9 May 2020 09:11:20 -0400 Subject: [PATCH 3/4] remove platform info --- kiwixbuild/platforms/ios.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/kiwixbuild/platforms/ios.py b/kiwixbuild/platforms/ios.py index 7f78f2b..2bb8c82 100644 --- a/kiwixbuild/platforms/ios.py +++ b/kiwixbuild/platforms/ios.py @@ -78,24 +78,12 @@ class iOSPlatformInfo(PlatformInfo): def configure_option(self): return '--host={}'.format(self.arch_full) -class iOSArmv7(iOSPlatformInfo): - name = 'iOS_armv7' - arch = cpu = 'armv7' - arch_full = 'armv7-apple-darwin' - sdk_name = 'iphoneos' - class iOSArm64(iOSPlatformInfo): name = 'iOS_arm64' arch = cpu = 'arm64' arch_full = 'arm-apple-darwin' sdk_name = 'iphoneos' -class iOSi386(iOSPlatformInfo): - name = 'iOS_i386' - arch = cpu = 'i386' - arch_full = 'i386-apple-darwin' - sdk_name = 'iphonesimulator' - class iOSx64(iOSPlatformInfo): name = 'iOS_x86_64' arch = cpu = 'x86_64' From d0677492d1280ad83cf27b596d4d41714d041dbe Mon Sep 17 00:00:00 2001 From: ChrisLi Date: Sun, 10 May 2020 19:55:45 -0400 Subject: [PATCH 4/4] remove from CI --- .github/workflows/ci.yml | 2 -- .travis.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15ce64b..c8d90b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,9 +140,7 @@ jobs: target: - native_dyn - iOS_arm64 - - iOS_i386 - iOS_x86_64 - - iOS_armv7 runs-on: macos-latest env: SSH_KEY: /tmp/id_rsa diff --git a/.travis.yml b/.travis.yml index 6b78217..ae5522c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,6 @@ jobs: os: osx - env: PLATFORM="iOS_arm64" os: osx - - env: PLATFORM="iOS_i386" - os: osx