-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:flutter/packages into fix_pi
- Loading branch information
Showing
39 changed files
with
226 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/ios_platform_images/ios/ios_platform_images/Package.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// swift-tools-version: 5.9 | ||
// The swift-tools-version declares the minimum version of Swift required to build this package. | ||
|
||
// Copyright 2013 The Flutter Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
import PackageDescription | ||
|
||
let package = Package( | ||
name: "ios_platform_images", | ||
platforms: [ | ||
.iOS("12.0") | ||
], | ||
products: [ | ||
.library(name: "ios-platform-images", targets: ["ios_platform_images"]) | ||
], | ||
dependencies: [], | ||
targets: [ | ||
.target( | ||
name: "ios_platform_images", | ||
dependencies: [], | ||
resources: [ | ||
.process("Resources") | ||
] | ||
) | ||
] | ||
) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,14 +14,14 @@ Downloaded by pub (not CocoaPods). | |
s.author = { 'Flutter Dev Team' => '[email protected]' } | ||
s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/video_player/video_player_avfoundation' } | ||
s.documentation_url = 'https://pub.dev/packages/video_player' | ||
s.source_files = 'Classes/*' | ||
s.ios.source_files = 'Classes/ios/*' | ||
s.osx.source_files = 'Classes/macos/*' | ||
s.public_header_files = 'Classes/**/*.h' | ||
s.source_files = 'video_player_avfoundation/Sources/video_player_avfoundation/**/*.{h,m}' | ||
s.ios.source_files = 'video_player_avfoundation/Sources/video_player_avfoundation_ios/*' | ||
s.osx.source_files = 'video_player_avfoundation/Sources/video_player_avfoundation_macos/*' | ||
s.public_header_files = 'video_player_avfoundation/Sources/video_player_avfoundation/include/**/*.h' | ||
s.ios.dependency 'Flutter' | ||
s.osx.dependency 'FlutterMacOS' | ||
s.ios.deployment_target = '12.0' | ||
s.osx.deployment_target = '10.14' | ||
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } | ||
s.resource_bundles = {'video_player_avfoundation_privacy' => ['Resources/PrivacyInfo.xcprivacy']} | ||
s.resource_bundles = {'video_player_avfoundation_privacy' => ['video_player_avfoundation/Sources/video_player_avfoundation/Resources/PrivacyInfo.xcprivacy']} | ||
end |
46 changes: 46 additions & 0 deletions
46
...ges/video_player/video_player_avfoundation/darwin/video_player_avfoundation/Package.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
// swift-tools-version: 5.9 | ||
|
||
// Copyright 2013 The Flutter Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
import PackageDescription | ||
|
||
let package = Package( | ||
name: "video_player_avfoundation", | ||
platforms: [ | ||
.iOS("12.0"), | ||
.macOS("10.14"), | ||
], | ||
products: [ | ||
.library(name: "video-player-avfoundation", targets: ["video_player_avfoundation"]) | ||
], | ||
dependencies: [], | ||
targets: [ | ||
.target( | ||
name: "video_player_avfoundation", | ||
dependencies: [ | ||
.target(name: "video_player_avfoundation_ios", condition: .when(platforms: [.iOS])), | ||
.target(name: "video_player_avfoundation_macos", condition: .when(platforms: [.macOS])), | ||
], | ||
resources: [ | ||
.process("Resources") | ||
], | ||
cSettings: [ | ||
.headerSearchPath("include/video_player_avfoundation") | ||
] | ||
), | ||
.target( | ||
name: "video_player_avfoundation_ios", | ||
cSettings: [ | ||
.headerSearchPath("../video_player_avfoundation/include/video_player_avfoundation") | ||
] | ||
), | ||
.target( | ||
name: "video_player_avfoundation_macos", | ||
cSettings: [ | ||
.headerSearchPath("../video_player_avfoundation/include/video_player_avfoundation") | ||
] | ||
), | ||
] | ||
) |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
...darwin/video_player_avfoundation/Sources/video_player_avfoundation_ios/include/FVPEmpty.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
// Copyright 2013 The Flutter Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
// Empty file to perserve include directory in pub-cache. See | ||
// https://github.com/flutter/flutter/issues/148002 for more information. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
6 changes: 6 additions & 0 deletions
6
...rwin/video_player_avfoundation/Sources/video_player_avfoundation_macos/include/FVPEmpty.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
// Copyright 2013 The Flutter Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
// Empty file to perserve include directory in pub-cache. See | ||
// https://github.com/flutter/flutter/issues/148002 for more information. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
...on/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"pins" : [ | ||
{ | ||
"identity" : "ocmock", | ||
"kind" : "remoteSourceControl", | ||
"location" : "https://github.com/erikdoe/ocmock", | ||
"state" : { | ||
"revision" : "ef21a2ece3ee092f8ed175417718bdd9b8eb7c9a" | ||
} | ||
} | ||
], | ||
"version" : 2 | ||
} |
13 changes: 13 additions & 0 deletions
13
..._player_avfoundation/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"pins" : [ | ||
{ | ||
"identity" : "ocmock", | ||
"kind" : "remoteSourceControl", | ||
"location" : "https://github.com/erikdoe/ocmock", | ||
"state" : { | ||
"revision" : "ef21a2ece3ee092f8ed175417718bdd9b8eb7c9a" | ||
} | ||
} | ||
], | ||
"version" : 2 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
.../example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"pins" : [ | ||
{ | ||
"identity" : "ocmock", | ||
"kind" : "remoteSourceControl", | ||
"location" : "https://github.com/erikdoe/ocmock", | ||
"state" : { | ||
"revision" : "ef21a2ece3ee092f8ed175417718bdd9b8eb7c9a" | ||
} | ||
} | ||
], | ||
"version" : 2 | ||
} |
Oops, something went wrong.