Skip to content

Commit 1b1e2e2

Browse files
authored
Merge pull request #65 from 87kangsw/hotfix/2.1.2
[Release] 2.1.2
2 parents ea29ffb + 7ec0449 commit 1b1e2e2

File tree

7 files changed

+26
-8
lines changed

7 files changed

+26
-8
lines changed

GitTime/Sources/Models/FavoriteLanguage.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ import RealmSwift
1212
class FavoriteLanguage: Object {
1313
@objc dynamic var name: String = ""
1414
@objc dynamic var color: String = ""
15+
16+
override class func primaryKey() -> String? {
17+
return "name"
18+
}
1519
}
1620

1721
extension FavoriteLanguage {

GitTime/Sources/ViewControllers/Activity/ActivityViewReactor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ final class ActivityViewReactor: ReactorKit.Reactor {
284284
/html/body[@class='logged-in env-production page-responsive page-profile']/div[@class='application-main ']/main[@id='js-pjax-container']/div[@class='container-xl px-3 px-md-4 px-lg-5']/div[@class='gutter-condensed gutter-lg flex-column flex-md-row d-flex']/div[@class='flex-shrink-0 col-12 col-md-3 mb-4 mb-md-0']/div[@class='h-card mt-md-n5']/div[@class='clearfix d-flex d-md-block flex-items-center mb-4 mb-md-0']/div[@class='position-relative d-inline-block col-2 col-md-12 mr-3 mr-md-0 flex-shrink-0']/a/img[@class='avatar avatar-user width-full border color-bg-primary']/@src
285285
*/
286286
for link in doc.css("img") {
287-
if let imgClass = link["class"], imgClass == "avatar avatar-user width-full border color-bg-primary" {
287+
if let imgClass = link["class"], imgClass == "avatar avatar-user width-full border color-bg-default" {
288288
profileURL = link["src"] ?? ""
289289
}
290290
}

GitTime/Sources/ViewControllers/Buddy/BuddyViewReactor.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,14 +283,12 @@ final class BuddyViewReactor: Reactor {
283283
}
284284
}
285285

286-
//
287286
for link in doc.css("img") {
288-
if let imgClass = link["class"], imgClass == "avatar avatar-user width-full border color-bg-primary" {
287+
if let imgClass = link["class"], imgClass == "avatar avatar-user width-full border color-bg-default" {
289288
profileURL = link["src"] ?? ""
290289
}
291290
}
292291

293-
//
294292
for span in doc.css("span") {
295293
if let itemProp = span["itemprop"], itemProp.isNotEmpty {
296294
if itemProp == "name" {

GitTime/Supporting Files/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<key>CFBundlePackageType</key>
8686
<string>APPL</string>
8787
<key>CFBundleShortVersionString</key>
88-
<string>2.1.1</string>
88+
<string>2.1.2</string>
8989
<key>CFBundleURLTypes</key>
9090
<array>
9191
<dict>
@@ -100,7 +100,7 @@
100100
</dict>
101101
</array>
102102
<key>CFBundleVersion</key>
103-
<string>3</string>
103+
<string>2</string>
104104
<key>ITSAppUsesNonExemptEncryption</key>
105105
<false/>
106106
<key>LSApplicationQueriesSchemes</key>

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ clean:
77
pod deintegrate
88

99
dev-upload:
10-
fastlane ios develop firebase_upload:true groups:iOS slack_notify:true
10+
fastlane ios develop firebase_upload:true groups:iOS slack_notify:true
11+
12+
appstore:
13+
fastlane ios release

fastlane/Fastfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,13 @@ platform :ios do
174174
)
175175
end
176176
end
177+
178+
lane :release do
179+
sync_code_signing(type: "appstore")
180+
build_app(scheme: "GitTime")
181+
upload_to_app_store(force: true)
182+
end
183+
184+
177185
end
178186

fastlane/README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,14 @@ fastlane ios message_to_slack
3636
fastlane ios new_member
3737
```
3838

39+
### ios release
40+
```
41+
fastlane ios release
42+
```
43+
3944

4045
----
4146

42-
This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
47+
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
4348
More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
4449
The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

0 commit comments

Comments
 (0)