Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from original repository #320

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Merge from original repository #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb731ab
Merge pull request #1 from agiapp/master
Horse888 Jul 11, 2024
f62fc83
Update Package.swift
Horse888 Jul 11, 2024
dd240f6
Merge pull request #2 from agiapp/master
Horse888 Sep 9, 2024
42b74a9
Update Package.swift
Horse888 Sep 9, 2024
20fb66b
Update Package.swift
Horse888 Sep 9, 2024
d1c0143
Update Package.swift
Horse888 Sep 9, 2024
2d5756a
Update Package.swift
Horse888 Sep 9, 2024
72191ed
Update Package.swift
Horse888 Sep 9, 2024
ff8b90a
Update Package.swift
Horse888 Sep 9, 2024
8b8a038
Update
Horse888 Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 BRPickerView/BRPickerView.h → BRPickerView/Include/BRPickerView.h
View file
Open in desktop
File renamed without changes.
18 changes: 13 additions & 5 deletions BRPickerViewDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
1AB995CB2C8F3E3600AEE7FD /* BRPickerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BRPickerView.h; sourceTree = "<group>"; };
451D6C0C234D6AA2004E801F /* BRPickerStyle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BRPickerStyle.h; sourceTree = "<group>"; };
451D6C0D234D6AA2004E801F /* BRPickerStyle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BRPickerStyle.m; sourceTree = "<group>"; };
451D6C0F23509890004E801F /* BRResultModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BRResultModel.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -105,7 +106,6 @@
C5ACE50A1F3D7D890069978B /* BRDatePickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRDatePickerView.m; sourceTree = "<group>"; };
C5ACE50C1F3D7E890069978B /* BRStringPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRStringPickerView.h; sourceTree = "<group>"; };
C5ACE50D1F3D7E890069978B /* BRStringPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRStringPickerView.m; sourceTree = "<group>"; };
C5ACE5201F3D90A90069978B /* BRPickerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BRPickerView.h; sourceTree = "<group>"; };
C5F069B9208F0BCA00C969B9 /* NSDate+BRPickerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDate+BRPickerView.h"; sourceTree = "<group>"; };
C5F069BA208F0BCA00C969B9 /* NSDate+BRPickerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+BRPickerView.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -121,6 +121,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1AB995CC2C8F3E3600AEE7FD /* Include */ = {
isa = PBXGroup;
children = (
1AB995CB2C8F3E3600AEE7FD /* BRPickerView.h */,
);
path = Include;
sourceTree = "<group>";
};
457868602C4758B6006F7FD6 /* DataFile */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -290,7 +298,7 @@
C5ACE4F01F3D5A8B0069978B /* BRPickerView */ = {
isa = PBXGroup;
children = (
C5ACE5201F3D90A90069978B /* BRPickerView.h */,
1AB995CC2C8F3E3600AEE7FD /* Include */,
45C2FA992BD789F80093928B /* PrivacyInfo.xcprivacy */,
4596CB0C2C365564003C6654 /* Core */,
458CB74A2C33FBFB00C46170 /* DatePicker */,
Expand Down Expand Up @@ -373,7 +381,7 @@
TargetAttributes = {
C5ACE4D51F3D58BD0069978B = {
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = N92S3NU839;
DevelopmentTeam = K34Z59STMC;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -588,7 +596,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = N92S3NU839;
DEVELOPMENT_TEAM = K34Z59STMC;
EXCLUDED_ARCHS = "";
INFOPLIST_FILE = BRPickerViewDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -605,7 +613,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = N92S3NU839;
DEVELOPMENT_TEAM = K34Z59STMC;
EXCLUDED_ARCHS = "";
INFOPLIST_FILE = BRPickerViewDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
9 changes: 5 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// swift-tools-version: 5.9
// swift-tools-version: 5.10
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
// 指定包的名称
name: "BRPickerView",
defaultLocalization: "en",
// 该库的一些配置
products: [
// Products define the executables and libraries a package produces, making them visible to other packages.
Expand All @@ -27,13 +28,13 @@ let package = Package(
.copy("PrivacyInfo.xcprivacy")
],
// 设置默认本地化为英语
defaultLocalization: "en",
// defaultLocalization: "en",
// 指定公共头文件的路径。在这里，它设置为当前目录（"."）
publicHeadersPath: ".",
publicHeadersPath: "Include",
// 为C语言源代码指定一些设置
cSettings: [
//Config header path
.headerSearchPath("."),
.headerSearchPath("Include"),
]
),
]
Expand Down