1.2.0

.github/workflows/pull_request_test.yml

@@ -3,25 +3,33 @@ name: PullRequestTest
 on:
   pull_request:
     branches:
-      - release
+      - dev
+
 jobs:
   build_test:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup Xcode version
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "14.2.0"
-
       - name: Bring ignored files
         uses: actions/checkout@v3
         with:
-          repository: Pepsi-Club/BusComing-ignored
+          repository: Pepsi-Club/WhereMyBus-ignored
           path: XCConfig/
           token: ${{ secrets.ACTION_TOKEN }}
-
+
+      - name: Setup Xcode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "14.3"
+
+      - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
+        with:
+            swift-version: "5.8.0"
+
+      - name: Get swift version
+        run: swift --version
+
       - name: Install Tuist
         run: curl -Ls https://install.tuist.io|bash
 

.github/workflows/upload_testflight.yml

@@ -1,12 +1,13 @@
 name: UploadTestflight
 
 on:
-  push:
+  pull_request:
     branches:
-      - release
+      - main
+
 jobs:
   upload_testflight:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v2
 
@@ -15,18 +16,26 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           known_hosts: ${{ secrets.KNOWN_HOSTS }}
 
-      - name: Setup Xcode version
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "14.2.0"
-
       - name: Bring ignored files
         uses: actions/checkout@v3
         with:
-          repository: Pepsi-Club/BusComing-ignored
+          repository: Pepsi-Club/WhereMyBus-ignored
           path: XCConfig/
           token: ${{ secrets.ACTION_TOKEN }}
 
+      - name: Move GoogleService Plist
+        run: |
+          mv XCConfig/GoogleService-Info.plist Projects/App/Resources/
+
+      - name: Setup Xcode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "14.3"
+
+      - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
+        with:
+          swift-version: "5.8.0"
+
       - name: Install Tuist
         run: curl -Ls https://install.tuist.io|bash
 
@@ -47,7 +56,8 @@ jobs:
         env:
           KEYCHAIN_NAME: ${{ secrets.KEYCHAIN_NAME }}
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
           APP_STORE_ISSUER_ID: ${{ secrets.APP_STORE_ISSUER_ID }}
           APP_STORE_PRIVATE_KEY: ${{ secrets.APP_STORE_PRIVATE_KEY }}
+          MATCH_URL: ${{ secrets.MATCH_URL }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}

.gitignore

@@ -143,7 +143,7 @@ Derived/
 Tuist/Dependencies
 
 # PList
-**/*.plist
+Projects/**/*.plist
 
 # XCConfig
 XCConfig/
@@ -157,4 +157,7 @@ XCConfig/
 # Package.resolved
 # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
 # hence it is not needed unless you have added a package configuration file to your project
-# .swiftpm
+# .swiftpm
+
+# CocoaPods
+Pods/

.swiftlint.yml

@@ -1,9 +1,11 @@
-included:
-    - Projects
 excluded: # 린트 과정에서 무시할 파일 경로. `included`보다 우선순위 높음
     - Projects/App/Sources/AppDelegate.swift
     - Projects/App/Sources/SceneDelegate.swift
+    - Projects/App/Tests/**
+    - Projects/Core/Sources/Extension/String+.swift
     - Projects/Feature/**/AppDelegate.swift
+    - Projects/Feature/**/SceneDelegate.swift
+    - Projects/FeatureDependency/Sources/Mock/**
     - Tuist
     - Derived
     - Plugins
@@ -14,11 +16,14 @@ identifier_name:
         error: 3
     excluded: # 제외할 문자열 목록
         - f
+        - vc
+        - vm
+        - o
 function_body_length:
     warning: 150
     error: 300
 type_body_length:
-    warning: 300
+    warning: 400
     error: 500
 file_length:
     warning: 1000
@@ -30,5 +35,6 @@ disabled_rules: # 제외하고 싶은 룰
     - trailing_whitespace
     - type_name # 타입명에 _가 들어가면 경고
     - trailing_comma # 배열 마지막 아이템에 ,가 붙으면 경고
+    - nesting # 중첩타입
 opt_in_rules:
     - empty_string

.tuist-version

@@ -1 +1 @@
-3.26.0
+3.28.0

Frameworks/NMapsMap/NMapsGeometry.xcframework/Info.plist

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_i386_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>NMapsGeometry.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>i386</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_armv7</string>
+			<key>LibraryPath</key>
+			<string>NMapsGeometry.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>armv7</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

Frameworks/NMapsMap/NMapsGeometry.xcframework/ios-arm64_armv7/NMapsGeometry.framework/Headers/NMGBounds.h

@@ -0,0 +1,48 @@
+//
+//  NMGBounds.h
+//  NMGeometryFramework
+//
+//  Created by mrtajo on 2017. 2. 6..
+//  Copyright © 2017년 NAVER. All rights reserved.
+//
+
+#import "NMGGeometry.h"
+
+@class NMGPoint;
+
+/**
+ 지도에 보여지는 사각형 영역을 정의한 Bounds.
+ NMGBounds는 평면직교 좌표계에 대한 클래스입니다.
+ */
+NMG_EXPORT
+@interface NMGBounds : NSObject <NMGBoundable>
+
+@property (nonatomic, nonnull) NMGPoint *min;
+@property (nonatomic, nonnull) NMGPoint *max;
+
+@property (nonatomic, readonly, nonnull) NMGPoint *center;
+@property (nonatomic, readonly) double width;
+@property (nonatomic, readonly) double height;
+
+@property (nonatomic, readonly) double minX;
+@property (nonatomic, readonly) double minY;
+@property (nonatomic, readonly) double maxX;
+@property (nonatomic, readonly) double maxY;
+
++ (nonnull instancetype)bounds;
++ (nonnull instancetype)boundsWithMinX:(double)minX minY:(double)minY maxX:(double)maxX maxY:(double)maxY;
++ (nonnull instancetype)boundsWithMinX:(double)x minY:(double)y width:(double)width height:(double)height;
++ (nonnull instancetype)boundsWithMin:(nonnull NMGPoint *)min max:(nonnull NMGPoint *)max;
+
+- (BOOL)hasPoint:(nonnull NMGPoint *)point;
+- (BOOL)hasBounds:(nonnull NMGBounds *)bounds;
+- (BOOL)isIntersect:(nonnull NMGBounds *)bounds;
+- (nullable NMGBounds *)intersectionWithBounds:(nonnull NMGBounds *)bounds __attribute__((warn_unused_result));
+- (nonnull NMGBounds *)expandToPoint:(nonnull NMGPoint *)point __attribute__((warn_unused_result));
+- (nonnull NMGBounds *)unionBounds:(nonnull NMGBounds *)bounds __attribute__((warn_unused_result));
+
+@end
+
+static inline NMGBounds * _Nonnull NMGBoundsMake(double minX, double minY, double maxX, double maxY) NS_SWIFT_UNAVAILABLE("Not use in swift.") {
+    return [NMGBounds boundsWithMinX:minX minY:minY maxX:maxX maxY:maxY];
+}

Frameworks/NMapsMap/NMapsGeometry.xcframework/ios-arm64_armv7/NMapsGeometry.framework/Headers/NMGConstants.h

@@ -0,0 +1,16 @@
+#import "NMGGeometry.h"
+
+#define RADIANS_TO_DEGREES(radians) ((radians) * (180.0 / M_PI))
+#define DEGREES_TO_RADIANS(angle) ((angle) / 180.0 * M_PI)
+
+static const double NaN = 0.0 / 0.0;
+static const double POSITIVE_INFINITY = 1.0 / 0.0;
+static const double NEGATIVE_INFINITY = -1.0 / 0.0;
+
+static const double HALFPI = M_PI / 2;
+static const double TWOPI = M_PI * 2;
+
+/**
+ 지구의 적도 반경. 미터 단위.
+ */
+const static double NMG_EARTH_RADIUS = 6378137;

Frameworks/NMapsMap/NMapsGeometry.xcframework/ios-arm64_armv7/NMapsGeometry.framework/Headers/NMGGeometry.h

@@ -0,0 +1,66 @@
+//
+//  NMGGeometry
+//  NMGeometryFramework
+//
+//  Created by Won-Young Son on 2017. 1. 10..
+//  Copyright © 2017년 NAVER. All rights reserved.
+//
+
+#import <CoreLocation/CoreLocation.h>
+
+#define NMG_EXPORT __attribute__((visibility ("default")))
+
+#pragma mark NMGGeometry Protocol
+
+@class NMGLatLng;
+@protocol NMGBoundable;
+
+@protocol NMGGeometry <NSObject>
+
+@property (nonatomic, readonly) BOOL isEmpty;
+@property (nonatomic, readonly) BOOL isValid;
+@property (nonatomic, readonly, nonnull, copy) NSString *description;
+
+@optional
+@property (nonatomic, readonly, nonnull) id<NMGBoundable> bounds;
+@end
+
+@protocol NMGPointable <NMGGeometry>
+@optional
+- (nonnull NMGLatLng *)toLatLng;
+- (BOOL)isWithinCoverage;
+
+@end
+
+#pragma mark - NMGMultiPointable Protocol
+
+@protocol NMGMultiPointable <NMGGeometry>
+
+@required
+@property (nonatomic, readonly, nonnull) NSArray *points;
+@property (nonatomic, readonly) NSUInteger count;
+- (void)addPoint:(nonnull id)point;
+- (nullable id)pointAtIndex:(NSUInteger)index;
+
+@optional
+- (void)insertPoint:(nonnull id)point atIndex:(NSUInteger)index;
+- (void)removePointAtIndex:(NSUInteger)index;
+- (void)removePoint:(nonnull id)point;
+
+- (void)addCoordinate:(CLLocationCoordinate2D)coordinate;
+- (void)insertCoordinate:(CLLocationCoordinate2D)coordinate atIndex:(NSUInteger)index;
+
+@end
+
+#pragma mark - NMGBoundable Protocol
+
+@protocol NMGBoundable <NMGGeometry>
+
+- (BOOL)hasPoint:(nonnull id<NMGPointable>)point;
+- (BOOL)hasBounds:(nonnull id<NMGBoundable>)bounds;
+- (BOOL)isIntersect:(nonnull id<NMGBoundable>)bounds;
+- (nullable id<NMGBoundable>)intersectionWithBounds:(nonnull id<NMGBoundable>)bounds __attribute__((warn_unused_result));
+- (nonnull id<NMGBoundable>)expandToPoint:(nonnull id<NMGPointable>)point __attribute__((warn_unused_result));
+- (nonnull id<NMGBoundable>)unionBounds:(nonnull id<NMGBoundable>)bounds __attribute__((warn_unused_result));
+
+@end