diff --git a/.gitignore b/.gitignore index 523c11d..2dac0ff 100644 --- a/.gitignore +++ b/.gitignore @@ -117,6 +117,16 @@ fastlane/Preview.html fastlane/screenshots/**/*.png fastlane/test_output +Fillin-iOS/fastlane/report.xml +Fillin-iOS/fastlane/Preview.html +Fillin-iOS/fastlane/test_output + +Fillin-iOS/fastlane/metadata/ +Fillin-iOS/fastlane/screenshots/ + + +Fillin-iOS/fastlane/APIkey.json + # Code Injection # After new code Injection tools there's a generated folder /iOSInjectionProject # https://github.com/johnno1962/injectionforxcode diff --git a/Fillin-iOS/Fillin-iOS.xcodeproj/project.pbxproj b/Fillin-iOS/Fillin-iOS.xcodeproj/project.pbxproj index 271b131..d38c444 100644 --- a/Fillin-iOS/Fillin-iOS.xcodeproj/project.pbxproj +++ b/Fillin-iOS/Fillin-iOS.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 60EEDCDC8F3EDA4BB80DBA48 /* Pods_Fillin_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC117782ADC4C5FD88BA24C4 /* Pods_Fillin_iOS.framework */; }; 6F3B877027968AEB00A4BD07 /* Assets+Generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F3B86E327968AEB00A4BD07 /* Assets+Generated.swift */; }; 6F3B877127968AEB00A4BD07 /* Xib.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F3B86E427968AEB00A4BD07 /* Xib.swift */; }; 6F3B877227968AEB00A4BD07 /* UserDefaultsKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F3B86E527968AEB00A4BD07 /* UserDefaultsKey.swift */; }; @@ -115,7 +116,6 @@ 77EB42212797D17600C726D8 /* FlimSelectAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77EB42202797D17600C726D8 /* FlimSelectAPI.swift */; }; 77EB42232797D1CE00C726D8 /* FilmSelectService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77EB42222797D1CE00C726D8 /* FilmSelectService.swift */; }; 77EB42262797DAFD00C726D8 /* FilmResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77EB42252797DAFD00C726D8 /* FilmResponse.swift */; }; - 9ADF3537C1D51ED22F4C921B /* Pods_Fillin_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F33300C623DFF466AFCE2914 /* Pods_Fillin_iOS.framework */; }; E80A726828CDDA66000A75B5 /* ReportFilmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E80A726728CDDA66000A75B5 /* ReportFilmViewController.swift */; }; E80A726A28CDDA7E000A75B5 /* ReportContactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E80A726928CDDA7E000A75B5 /* ReportContactViewController.swift */; }; E822163528C860CC0090CEC5 /* ReportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E822163428C860CC0090CEC5 /* ReportViewController.swift */; }; @@ -132,7 +132,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 18FC9C8D02E669D0F43E8733 /* Pods-Fillin-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Fillin-iOS.release.xcconfig"; path = "Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS.release.xcconfig"; sourceTree = ""; }; 6F3B86E327968AEB00A4BD07 /* Assets+Generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Assets+Generated.swift"; sourceTree = ""; }; 6F3B86E427968AEB00A4BD07 /* Xib.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Xib.swift; sourceTree = ""; }; 6F3B86E527968AEB00A4BD07 /* UserDefaultsKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultsKey.swift; sourceTree = ""; }; @@ -244,7 +243,9 @@ 77EB42202797D17600C726D8 /* FlimSelectAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlimSelectAPI.swift; sourceTree = ""; }; 77EB42222797D1CE00C726D8 /* FilmSelectService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilmSelectService.swift; sourceTree = ""; }; 77EB42252797DAFD00C726D8 /* FilmResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilmResponse.swift; sourceTree = ""; }; - 864A552B88FE473B50DE4171 /* Pods-Fillin-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Fillin-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS.debug.xcconfig"; sourceTree = ""; }; + 7AC7A673AAEC90C6FFB53103 /* Pods-Fillin-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Fillin-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS.debug.xcconfig"; sourceTree = ""; }; + 8707F5933C668371B1C58EBD /* Pods-Fillin-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Fillin-iOS.release.xcconfig"; path = "Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS.release.xcconfig"; sourceTree = ""; }; + BC117782ADC4C5FD88BA24C4 /* Pods_Fillin_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Fillin_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E80A726728CDDA66000A75B5 /* ReportFilmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportFilmViewController.swift; sourceTree = ""; }; E80A726928CDDA7E000A75B5 /* ReportContactViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportContactViewController.swift; sourceTree = ""; }; E822163428C860CC0090CEC5 /* ReportViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportViewController.swift; sourceTree = ""; }; @@ -258,7 +259,6 @@ E8DDE18428DEDECF00CC000D /* ReportPopUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportPopUpViewController.swift; sourceTree = ""; }; E8EB7A5528C090AB0091DA22 /* TermsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TermsViewController.swift; sourceTree = ""; }; E8EB7A5728C093080091DA22 /* TermTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TermTableViewCell.swift; sourceTree = ""; }; - F33300C623DFF466AFCE2914 /* Pods_Fillin_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Fillin_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -266,26 +266,18 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9ADF3537C1D51ED22F4C921B /* Pods_Fillin_iOS.framework in Frameworks */, + 60EEDCDC8F3EDA4BB80DBA48 /* Pods_Fillin_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 33B49427CA26D6FA968A16CD /* Frameworks */ = { - isa = PBXGroup; - children = ( - F33300C623DFF466AFCE2914 /* Pods_Fillin_iOS.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 395998FF8B0904B6BF7C4A7B /* Pods */ = { isa = PBXGroup; children = ( - 864A552B88FE473B50DE4171 /* Pods-Fillin-iOS.debug.xcconfig */, - 18FC9C8D02E669D0F43E8733 /* Pods-Fillin-iOS.release.xcconfig */, + 7AC7A673AAEC90C6FFB53103 /* Pods-Fillin-iOS.debug.xcconfig */, + 8707F5933C668371B1C58EBD /* Pods-Fillin-iOS.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -776,7 +768,7 @@ 6F3B86E027968AEB00A4BD07 /* Fillin-iOS */, 775C9646278ACBEA00A9BEA0 /* Products */, 395998FF8B0904B6BF7C4A7B /* Pods */, - 33B49427CA26D6FA968A16CD /* Frameworks */, + E81C54AAC6AE9EB8007C3A5B /* Frameworks */, ); sourceTree = ""; }; @@ -842,6 +834,14 @@ path = DataModel; sourceTree = ""; }; + E81C54AAC6AE9EB8007C3A5B /* Frameworks */ = { + isa = PBXGroup; + children = ( + BC117782ADC4C5FD88BA24C4 /* Pods_Fillin_iOS.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; E822163328C860AD0090CEC5 /* ReportViewController */ = { isa = PBXGroup; children = ( @@ -877,13 +877,13 @@ isa = PBXNativeTarget; buildConfigurationList = 775C9659278ACBEB00A9BEA0 /* Build configuration list for PBXNativeTarget "Fillin-iOS" */; buildPhases = ( - BA49CBAC8CB3ACAC9509ECE3 /* [CP] Check Pods Manifest.lock */, + 0ECCB96FE26066C3770AFDB8 /* [CP] Check Pods Manifest.lock */, 775C96AE278B317100A9BEA0 /* SwiftGen Script */, 775C9641278ACBEA00A9BEA0 /* Sources */, 775C9642278ACBEA00A9BEA0 /* Frameworks */, 775C9643278ACBEA00A9BEA0 /* Resources */, 775C965C278ACCFD00A9BEA0 /* SwiftLint Script */, - D399231579ACE63785E41A32 /* [CP] Embed Pods Frameworks */, + 2FBDE1B95EB70CD403CDBEF5 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -971,7 +971,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 775C965C278ACCFD00A9BEA0 /* SwiftLint Script */ = { + 0ECCB96FE26066C3770AFDB8 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -979,35 +979,38 @@ inputFileListPaths = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "SwiftLint Script"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Fillin-iOS-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "${PODS_ROOT}/SwiftLint/swiftlint\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; }; - 775C96AE278B317100A9BEA0 /* SwiftGen Script */ = { + 2FBDE1B95EB70CD403CDBEF5 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); - name = "SwiftGen Script"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [[ -f \"${PODS_ROOT}/SwiftGen/bin/swiftgen\" ]]; then\n \"${PODS_ROOT}/SwiftGen/bin/swiftgen\"\nelse\n echo \"warning: SwiftGen is not installed. Run 'pod install --repo-update' to install it.\"\nfi\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; - BA49CBAC8CB3ACAC9509ECE3 /* [CP] Check Pods Manifest.lock */ = { + 775C965C278ACCFD00A9BEA0 /* SwiftLint Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1015,36 +1018,33 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Check Pods Manifest.lock"; + name = "SwiftLint Script"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Fillin-iOS-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; + shellScript = "${PODS_ROOT}/SwiftLint/swiftlint\n"; }; - D399231579ACE63785E41A32 /* [CP] Embed Pods Frameworks */ = { + 775C96AE278B317100A9BEA0 /* SwiftGen Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + ); + name = "SwiftGen Script"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "if [[ -f \"${PODS_ROOT}/SwiftGen/bin/swiftgen\" ]]; then\n \"${PODS_ROOT}/SwiftGen/bin/swiftgen\"\nelse\n echo \"warning: SwiftGen is not installed. Run 'pod install --repo-update' to install it.\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1278,14 +1278,16 @@ }; 775C965A278ACBEB00A9BEA0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 864A552B88FE473B50DE4171 /* Pods-Fillin-iOS.debug.xcconfig */; + baseConfigurationReference = 7AC7A673AAEC90C6FFB53103 /* Pods-Fillin-iOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "Fillin-iOS/Fillin-iOS.entitlements"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = T3VFJ764ZC; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = T3VFJ764ZC; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "Fillin-iOS/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "FILL-IN"; @@ -1307,6 +1309,8 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.YJC.Fillin-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.YJC.Fillin-iOS"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -1315,14 +1319,16 @@ }; 775C965B278ACBEB00A9BEA0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 18FC9C8D02E669D0F43E8733 /* Pods-Fillin-iOS.release.xcconfig */; + baseConfigurationReference = 8707F5933C668371B1C58EBD /* Pods-Fillin-iOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "Fillin-iOS/Fillin-iOS.entitlements"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = T3VFJ764ZC; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = T3VFJ764ZC; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "Fillin-iOS/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "FILL-IN"; @@ -1344,6 +1350,8 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.YJC.Fillin-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.YJC.Fillin-iOS"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; diff --git a/Fillin-iOS/Fillin-iOS/Resources/Constants/Assets+Generated.swift b/Fillin-iOS/Fillin-iOS/Resources/Constants/Assets+Generated.swift index dc19357..4ba30b2 100644 --- a/Fillin-iOS/Fillin-iOS/Resources/Constants/Assets+Generated.swift +++ b/Fillin-iOS/Fillin-iOS/Resources/Constants/Assets+Generated.swift @@ -8,6 +8,9 @@ #elseif os(tvOS) || os(watchOS) import UIKit #endif +#if canImport(SwiftUI) + import SwiftUI +#endif // Deprecated typealiases @available(*, deprecated, renamed: "ColorAsset.Color", message: "This typealias will be removed in SwiftGen 7.0") @@ -127,6 +130,13 @@ internal final class ColorAsset { } #endif + #if canImport(SwiftUI) + @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) + internal private(set) lazy var swiftUIColor: SwiftUI.Color = { + SwiftUI.Color(asset: self) + }() + #endif + fileprivate init(name: String) { self.name = name } @@ -146,6 +156,16 @@ internal extension ColorAsset.Color { } } +#if canImport(SwiftUI) +@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) +internal extension SwiftUI.Color { + init(asset: ColorAsset) { + let bundle = BundleToken.bundle + self.init(asset.name, bundle: bundle) + } +} +#endif + internal struct ImageAsset { internal fileprivate(set) var name: String @@ -182,6 +202,13 @@ internal struct ImageAsset { return result } #endif + + #if canImport(SwiftUI) + @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) + internal var swiftUIImage: SwiftUI.Image { + SwiftUI.Image(asset: self) + } + #endif } internal extension ImageAsset.Image { @@ -200,6 +227,26 @@ internal extension ImageAsset.Image { } } +#if canImport(SwiftUI) +@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) +internal extension SwiftUI.Image { + init(asset: ImageAsset) { + let bundle = BundleToken.bundle + self.init(asset.name, bundle: bundle) + } + + init(asset: ImageAsset, label: Text) { + let bundle = BundleToken.bundle + self.init(asset.name, bundle: bundle, label: label) + } + + init(decorative asset: ImageAsset) { + let bundle = BundleToken.bundle + self.init(decorative: asset.name, bundle: bundle) + } +} +#endif + // swiftlint:disable convenience_type private final class BundleToken { static let bundle: Bundle = { diff --git a/Fillin-iOS/Gemfile b/Fillin-iOS/Gemfile new file mode 100644 index 0000000..7a118b4 --- /dev/null +++ b/Fillin-iOS/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" diff --git a/Fillin-iOS/Gemfile.lock b/Fillin-iOS/Gemfile.lock new file mode 100644 index 0000000..ea6b12c --- /dev/null +++ b/Fillin-iOS/Gemfile.lock @@ -0,0 +1,218 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.6) + rexml + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.2.0) + aws-partitions (1.715.0) + aws-sdk-core (3.170.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.62.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.119.1) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.99.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.2.6) + fastlane (2.212.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.34.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-core (0.11.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.12.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.44.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) + memoist (0.16.2) + mini_magick (4.12.0) + mini_mime (1.1.2) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) + plist (3.7.0) + public_suffix (5.0.1) + rake (13.0.6) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.3) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) + webrick (1.8.1) + word_wrap (1.0.0) + xcodeproj (1.22.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + x86_64-darwin-21 + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.3.11 diff --git a/Fillin-iOS/Podfile.lock b/Fillin-iOS/Podfile.lock index 707af7e..9eca63d 100644 --- a/Fillin-iOS/Podfile.lock +++ b/Fillin-iOS/Podfile.lock @@ -1,18 +1,20 @@ PODS: - - Alamofire (5.5.0) - - Kingfisher (7.1.2) + - Alamofire (5.6.4) + - Kingfisher (7.6.1) - Moya (14.0.0): - Moya/Core (= 14.0.0) - Moya/Core (14.0.0): - Alamofire (~> 5.0) - - NMapsMap (3.14.0) + - NMapsGeometry (1.0.1) + - NMapsMap (3.16.2): + - NMapsGeometry - NVActivityIndicatorView (5.1.1): - NVActivityIndicatorView/Base (= 5.1.1) - NVActivityIndicatorView/Base (5.1.1) - SnapKit (5.0.1) - - SwiftGen (6.5.1) - - SwiftLint (0.45.1) - - Then (2.7.0) + - SwiftGen (6.6.2) + - SwiftLint (0.50.3) + - Then (3.0.0) DEPENDENCIES: - Kingfisher (~> 7.0) @@ -29,6 +31,7 @@ SPEC REPOS: - Alamofire - Kingfisher - Moya + - NMapsGeometry - NMapsMap - NVActivityIndicatorView - SnapKit @@ -37,16 +40,17 @@ SPEC REPOS: - Then SPEC CHECKSUMS: - Alamofire: 1c4fb5369c3fe93d2857c780d8bbe09f06f97e7c - Kingfisher: 44ed6a8504763f27bab46163adfac83f5deb240c + Alamofire: 4e95d97098eacb88856099c4fc79b526a299e48c + Kingfisher: 93a3c6d0d551658a31e19f21747e1d15cb39d525 Moya: 5b45dacb75adb009f97fde91c204c1e565d31916 - NMapsMap: 61c2abfc409bbcdc91583ccc455a5b6f64c7414e + NMapsGeometry: 53c573ead66466681cf123f99f698dc8071a4b83 + NMapsMap: aaa64717249b06ae82c3a3addb3a01f0e33100ab NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667 SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb - SwiftGen: a6d22010845f08fe18fbdf3a07a8e380fd22e0ea - SwiftLint: 06ac37e4d38c7068e0935bb30cda95f093bec761 - Then: acfe0be7e98221c6204e12f8161459606d5d822d + SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c + SwiftLint: 77f7cb2b9bb81ab4a12fcc86448ba3f11afa50c6 + Then: 844265ae87834bbe1147d91d5d41a404da2ec27d PODFILE CHECKSUM: c9870ed3bef4faa80f8c3c313e3aa8d35e86e515 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/Fillin-iOS/fastlane/Appfile b/Fillin-iOS/fastlane/Appfile new file mode 100644 index 0000000..248d140 --- /dev/null +++ b/Fillin-iOS/fastlane/Appfile @@ -0,0 +1,8 @@ +app_identifier("com.YJC.Fillin-iOS") # The bundle identifier of your app +apple_id("choi990406@gmail.com") # Your Apple Developer Portal username + +itc_team_id("123531096") # App Store Connect Team ID +team_id("T3VFJ764ZC") # Developer Portal Team ID + +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile diff --git a/Fillin-iOS/fastlane/Deliverfile b/Fillin-iOS/fastlane/Deliverfile new file mode 100644 index 0000000..74739f7 --- /dev/null +++ b/Fillin-iOS/fastlane/Deliverfile @@ -0,0 +1,3 @@ +# The Deliverfile allows you to store various App Store Connect metadata +# For more information, check out the docs +# https://docs.fastlane.tools/actions/deliver/ diff --git a/Fillin-iOS/fastlane/Fastfile b/Fillin-iOS/fastlane/Fastfile new file mode 100644 index 0000000..7612c5e --- /dev/null +++ b/Fillin-iOS/fastlane/Fastfile @@ -0,0 +1,25 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:ios) + +platform :ios do + desc "Push a new release build to the App Store" + lane :release do + increment_build_number(xcodeproj: "Fillin-iOS.xcodeproj") + build_app(workspace: "Fillin-iOS.xcworkspace", scheme: "Fillin-iOS") + upload_to_app_store + end +end diff --git a/Fillin-iOS/fastlane/Matchfile b/Fillin-iOS/fastlane/Matchfile new file mode 100644 index 0000000..5b78e30 --- /dev/null +++ b/Fillin-iOS/fastlane/Matchfile @@ -0,0 +1,13 @@ +git_url("https://github.com/dlwns33/Fastlane-Match") + +storage_mode("git") + +type("appstore") # The default type, can be: appstore, adhoc, enterprise or development + +# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"]) +# username("user@fastlane.tools") # Your Apple Developer Portal username + +# For all available options run `fastlane match --help` +# Remove the # in the beginning of the line to enable the other options + +# The docs are available on https://docs.fastlane.tools/actions/match