Skip to content

Commit

Permalink
fix Xcode11 dependency libc++ and support module
Browse files Browse the repository at this point in the history
  • Loading branch information
ValiantCat committed Dec 13, 2019
1 parent ac3aa2f commit 7dc411d
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 87 deletions.
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '8.0'
platform :ios, '9.0'
use_frameworks!
target 'XXShield_Example' do
pod 'XXShield', :path => '../'
Expand Down
18 changes: 9 additions & 9 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PODS:
- Nimble (7.0.2)
- Quick (1.2.0)
- XXShield (2.2.0)
- Nimble (8.0.4)
- Quick (2.2.0)
- XXShield (2.3.0)

DEPENDENCIES:
- Nimble
- Quick
- XXShield (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
trunk:
- Nimble
- Quick

Expand All @@ -18,10 +18,10 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
XXShield: 31cb5badded8555e2f27f9439ca7b603c83939ce
Nimble: 18d5360282923225d62b09d781f63abc1a0111fc
Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e
XXShield: b0608906e060154f9078df922a665199e7cf08b3

PODFILE CHECKSUM: cb0f187cc3e5c397008a335d15152f7845281ec0
PODFILE CHECKSUM: 6250b357771a0da19b10bd2f9464a36ebd20892b

COCOAPODS: 1.5.3
COCOAPODS: 1.8.4
116 changes: 63 additions & 53 deletions Example/XXShield.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "XXShield_Example.app"
BlueprintName = "XXShield_Example"
ReferencedContainer = "container:XXShield.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "XXShield_Example.app"
BlueprintName = "XXShield_Example"
ReferencedContainer = "container:XXShield.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -71,8 +69,6 @@
ReferencedContainer = "container:XXShield.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0910"
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -10,7 +10,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand All @@ -24,22 +23,17 @@
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
9 changes: 9 additions & 0 deletions Example/XXShield/File.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//
// File.swift
// XXShield_Example
//
// Created by nero on 2019/12/13.
// Copyright © 2019 ValiantCat. All rights reserved.
//

import Foundation
4 changes: 4 additions & 0 deletions Example/XXShield/XXShield_Example-Bridging-Header.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

8 changes: 5 additions & 3 deletions XXShield.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'XXShield'
s.version = '2.2.0'
s.version = '2.3.0'
s.summary = 'Avoid Crash'
s.description = <<-DESC
1. unrecoginzed Selector Crash
Expand All @@ -15,8 +15,8 @@ DESC
s.license = { :type => 'Apache', :file => 'LICENSE' }
s.author = { 'ValiantCat' => '[email protected]' }
s.source = { :git => 'https://github.com/ValiantCat/XXShield.git', :tag => s.version.to_s }
s.platform = :ios, '7.0'
s.ios.deployment_target = '7.0'
s.platform = :ios, '9.0'
s.ios.deployment_target = '9.0'
s.module_map = 'XXShield/XXShield.modulemap'
s.public_header_files = 'XXShield/Classes/*.h'
s.private_header_files = 'XXShield/Classes/template/*.h'
Expand All @@ -34,8 +34,10 @@ DESC
'XXShield/Classes/DanglingPointerShield/ForwordingCenterForDanglingPoint.m',
'XXShield/Classes/DanglingPointerShield/XXDanglingPonterClassService.m'
]
s.libraries = 'c++'
s.pod_target_xcconfig = {
'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
'DEFINES_MODULE' => 'YES'
# 'SWIFT_VERSION' => ''
}

Expand Down

0 comments on commit 7dc411d

Please sign in to comment.