Skip to content

Commit

Permalink
Merge branch '1-10-stable' into merge-1-10-to-master
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.github/workflows/Lint.yml
#	spec/cocoapods-integration-specs
  • Loading branch information
@igor-makarov
igor-makarov committed Oct 3, 2020
2 parents 3593ac0 + 20a8ff2 commit 438d01d
Show file tree
Hide file tree
Showing 52 changed files with 273 additions and 93 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/Lint.yml
View file
Expand Up @@ -3,6 +3,8 @@ name: Lint
jobs:
lint:
runs-on: ubuntu-16.04
env:
COCOAPODS_CI_TASKS: LINT
steps:
- name: Checkout git
uses: actions/checkout@v1
Expand All @@ -26,9 +28,6 @@ jobs:
- name: Run Tests
run: bundle exec rake spec:all
env:
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COCOAPODS_CI_TASKS: LINT

on:
push:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Expand Up @@ -31,6 +31,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#8649](https://github.com/CocoaPods/CocoaPods/issues/8649)

* Generate the correct LD `-l` flags for XCFrameworks containing libraries
[Wes Campaigne](https://github.com/Westacular)
[#10071](https://github.com/CocoaPods/CocoaPods/issues/10071)

## 1.10.0.rc.1 (2020-09-15)

Expand Down
9 changes: 9 additions & 0 deletions Rakefile
View file
Expand Up @@ -172,6 +172,15 @@ begin

unless ENV['CI'].nil?
title 'Running Danger'
# The obfuscated token is hard-coded into the repo because GitHub's Actions have no option to make a secret
# available to PRs from forks. This token belongs to @CocoaPodsBarista and has no permissions except posting
# comments. The reason it is needed is to inform the PR author of things Danger has suggestions for.
ENV['DANGER_GITHUB_API_TOKEN'] = [:d, 2, :c, :e, 4,
6, 5, :d, 3, :c, :b, 3, 3,
:b, 6, 4, 4, 8, 2, 3, 2, :f,
1, 8, :d, 8, :a, 5, 1, 6,
5, 4, 4, 2, :c, :e, 3,
:b, 0, :b].map(&:to_s).join
Rake::Task['danger'].invoke
end
end
Expand Down
3 changes: 3 additions & 0 deletions examples/Vendored XCFramework Example/AppUsingStaticLibraries/AppDelegate.swift
View file
Expand Up @@ -7,13 +7,16 @@
//

import UIKit
import CoconutLib

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {



func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
let coconut = CoconutObj()
print("Successfully loaded .xcframework dependency type \(type(of: coconut))")
// Override point for customization after application launch.
return true
}
Expand Down
2 changes: 1 addition & 1 deletion examples/Vendored XCFramework Example/BananaLib/BananaLib.podspec
View file
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
spec.ios.deployment_target = '13.0'
spec.watchos.deployment_target = '3.0'
spec.osx.deployment_target = '10.12'

spec.default_subspecs = 'DynamicFramework'

spec.subspec 'DynamicFramework' do |ss|
Expand Down
60 changes: 32 additions & 28 deletions ...es/Vendored XCFramework Example/BananaLib/StaticLibrary/CoconutLib.xcframework/Info.plist
View file
Expand Up @@ -8,25 +8,23 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>watchos-i386-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>i386</string>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>watchos</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>ios</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>macos-x86_64</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>x86_64</string>
Expand All @@ -38,41 +36,43 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-x86_64-simulator</string>
<string>ios-x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>maccatalyst</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>watchos-arm64_32_armv7k</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>arm64_32</string>
<string>armv7k</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<string>watchos</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>tvos-x86_64-simulator</string>
<string>tvos-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
Expand All @@ -84,46 +84,50 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-x86_64-maccatalyst</string>
<string>watchos-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<string>watchos</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>tvos-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>tvos</string>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>watchos-armv7k_arm64_32</string>
<string>tvos-arm64</string>
<key>LibraryPath</key>
<string>libCoconutLib.a</string>
<string>libCoconut.a</string>
<key>SupportedArchitectures</key>
<array>
<string>armv7k</string>
<string>arm64_32</string>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>watchos</string>
<string>tvos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
8 changes: 8 additions & 0 deletions ...mework Example/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-arm64/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ...ork Example/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-arm64/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions ...Example/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-arm64/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file added ...XCFramework Example/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-arm64/libCoconut.a
View file
Binary file not shown.
Binary file removed ...ramework Example/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-arm64/libCoconutLib.a
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions ...nanaLib/StaticLibrary/CoconutLib.xcframework/ios-arm64_x86_64-simulator/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ...vos-x86_64-simulator/Headers/CoconutLib.h → ...m64_x86_64-simulator/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions .../StaticLibrary/CoconutLib.xcframework/ios-arm64_x86_64-simulator/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file added ...le/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-arm64_x86_64-simulator/libCoconut.a
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions ...e/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-x86_64-maccatalyst/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ...ananaLib/StaticLibrary/CoconutLib.xcframework/ios-x86_64-maccatalyst/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions ...aLib/StaticLibrary/CoconutLib.xcframework/ios-x86_64-maccatalyst/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file renamed ...rk/ios-x86_64-maccatalyst/libCoconutLib.a → ...ework/ios-x86_64-maccatalyst/libCoconut.a
View file
Binary file not shown.
Binary file removed ...ample/BananaLib/StaticLibrary/CoconutLib.xcframework/ios-x86_64-simulator/libCoconutLib.a
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions ...ork Example/BananaLib/StaticLibrary/CoconutLib.xcframework/macos-x86_64/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ... Example/BananaLib/StaticLibrary/CoconutLib.xcframework/macos-x86_64/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions ...mple/BananaLib/StaticLibrary/CoconutLib.xcframework/macos-x86_64/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file renamed ....xcframework/macos-x86_64/libCoconutLib.a → ...Lib.xcframework/macos-x86_64/libCoconut.a
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions ...ework Example/BananaLib/StaticLibrary/CoconutLib.xcframework/tvos-arm64/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ...rk Example/BananaLib/StaticLibrary/CoconutLib.xcframework/tvos-arm64/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions ...xample/BananaLib/StaticLibrary/CoconutLib.xcframework/tvos-arm64/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file added ...CFramework Example/BananaLib/StaticLibrary/CoconutLib.xcframework/tvos-arm64/libCoconut.a
View file
Binary file not shown.
Binary file removed ...amework Example/BananaLib/StaticLibrary/CoconutLib.xcframework/tvos-arm64/libCoconutLib.a
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions ...anaLib/StaticLibrary/CoconutLib.xcframework/tvos-arm64_x86_64-simulator/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ...chos-armv7k_arm64_32/Headers/CoconutLib.h → ...m64_x86_64-simulator/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions ...StaticLibrary/CoconutLib.xcframework/tvos-arm64_x86_64-simulator/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file added ...e/BananaLib/StaticLibrary/CoconutLib.xcframework/tvos-arm64_x86_64-simulator/libCoconut.a
View file
Binary file not shown.
Binary file removed ...mple/BananaLib/StaticLibrary/CoconutLib.xcframework/tvos-x86_64-simulator/libCoconutLib.a
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions .../BananaLib/StaticLibrary/CoconutLib.xcframework/watchos-arm64_32_armv7k/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ...ios-x86_64-simulator/Headers/CoconutLib.h → ...chos-arm64_32_armv7k/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions ...Lib/StaticLibrary/CoconutLib.xcframework/watchos-arm64_32_armv7k/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file added ...ample/BananaLib/StaticLibrary/CoconutLib.xcframework/watchos-arm64_32_armv7k/libCoconut.a
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions ...taticLibrary/CoconutLib.xcframework/watchos-arm64_i386_x86_64-simulator/Headers/Coconut.h
View file
@@ -0,0 +1,8 @@

#import <Foundation/Foundation.h>

/** Coconuts are cool */
@interface CoconutObj : NSObject

- (void)makeCoconuts;
@end
2 changes: 1 addition & 1 deletion ...tchos-i386-simulator/Headers/CoconutLib.h → ...386_x86_64-simulator/Headers/CoconutLib.h
View file
Expand Up @@ -6,4 +6,4 @@ FOUNDATION_EXPORT double CoconutLibVersionNumber;
//! Project version string for CoconutLib.
FOUNDATION_EXPORT const unsigned char CoconutLibVersionString[];

#import <CoconutLib/Coconut.h>
#import "Coconut.h"
4 changes: 4 additions & 0 deletions ...brary/CoconutLib.xcframework/watchos-arm64_i386_x86_64-simulator/Headers/module.modulemap
View file
@@ -0,0 +1,4 @@
module CoconutLib {
umbrella header "CoconutLib.h"
export *
}
Binary file added ...Lib/StaticLibrary/CoconutLib.xcframework/watchos-arm64_i386_x86_64-simulator/libCoconut.a
View file
Binary file not shown.
Binary file removed ...le/BananaLib/StaticLibrary/CoconutLib.xcframework/watchos-armv7k_arm64_32/libCoconutLib.a
View file
Binary file not shown.
Binary file removed ...ple/BananaLib/StaticLibrary/CoconutLib.xcframework/watchos-i386-simulator/libCoconutLib.a
View file
Binary file not shown.

0 comments on commit 438d01d

Please sign in to comment.