Skip to content

Commit 3db0238

Browse files
chiciochicio
committed
Release 1.2.2 🚀
1 parent 742ec26 commit 3db0238

File tree

206 files changed

+8326
-2956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+8326
-2956
lines changed

‎Assets/03-mp3-load.png

1.06 MB
Loading

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Change Log
22
All changes to Mp3ID3Tagger will be documented in this file.
33

4+
## [1.2.2](https://github.com/chicio/Mp3ID3Tagger/releases/tag/1.2.2)
5+
Release date: 2019-02-07.
6+
7+
#### Added
8+
- Support for v2.4 of the ID3 standard.
9+
410
## [1.2.1](https://github.com/chicio/Mp3ID3Tagger/releases/tag/1.2.1)
511
Release date: 2018-08-14.
612

‎Mp3ID3Tagger.xcodeproj/project.pbxproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@
403403
TargetAttributes = {
404404
45325CC1206E9CFB0088B3E6 = {
405405
CreatedOnToolsVersion = 9.2;
406+
LastSwiftMigration = 1010;
406407
ProvisioningStyle = Automatic;
407408
SystemCapabilities = {
408409
com.apple.Sandbox = {
@@ -412,6 +413,7 @@
412413
};
413414
45325CE6206E9DEB0088B3E6 = {
414415
CreatedOnToolsVersion = 9.2;
416+
LastSwiftMigration = 1010;
415417
ProvisioningStyle = Automatic;
416418
TestTargetID = 45325CC1206E9CFB0088B3E6;
417419
};
@@ -506,6 +508,7 @@
506508
inputPaths = (
507509
"${SRCROOT}/Pods/Target Support Files/Pods-Mp3ID3TaggerTests/Pods-Mp3ID3TaggerTests-frameworks.sh",
508510
"${BUILT_PRODUCTS_DIR}/ID3TagEditor/ID3TagEditor.framework",
511+
"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
509512
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
510513
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
511514
"${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework",
@@ -514,6 +517,7 @@
514517
name = "[CP] Embed Pods Frameworks";
515518
outputPaths = (
516519
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ID3TagEditor.framework",
520+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
517521
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
518522
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
519523
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework",
@@ -532,12 +536,14 @@
532536
inputPaths = (
533537
"${SRCROOT}/Pods/Target Support Files/Pods-Mp3ID3Tagger/Pods-Mp3ID3Tagger-frameworks.sh",
534538
"${BUILT_PRODUCTS_DIR}/ID3TagEditor/ID3TagEditor.framework",
539+
"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
535540
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
536541
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
537542
);
538543
name = "[CP] Embed Pods Frameworks";
539544
outputPaths = (
540545
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ID3TagEditor.framework",
546+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
541547
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
542548
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
543549
);
@@ -740,7 +746,7 @@
740746
PRODUCT_BUNDLE_IDENTIFIER = it.chicio.Mp3ID3Tagger;
741747
PRODUCT_NAME = "$(TARGET_NAME)";
742748
PROVISIONING_PROFILE_SPECIFIER = "";
743-
SWIFT_VERSION = 4.0;
749+
SWIFT_VERSION = 4.2;
744750
};
745751
name = Debug;
746752
};
@@ -758,7 +764,7 @@
758764
PRODUCT_BUNDLE_IDENTIFIER = it.chicio.Mp3ID3Tagger;
759765
PRODUCT_NAME = "$(TARGET_NAME)";
760766
PROVISIONING_PROFILE_SPECIFIER = "";
761-
SWIFT_VERSION = 4.0;
767+
SWIFT_VERSION = 4.2;
762768
};
763769
name = Release;
764770
};
@@ -776,7 +782,7 @@
776782
PRODUCT_BUNDLE_IDENTIFIER = it.chicio.Mp3ID3TaggerTests;
777783
PRODUCT_NAME = "$(TARGET_NAME)";
778784
PROVISIONING_PROFILE_SPECIFIER = "";
779-
SWIFT_VERSION = 4.0;
785+
SWIFT_VERSION = 4.2;
780786
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Mp3ID3Tagger.app/Contents/MacOS/Mp3ID3Tagger";
781787
};
782788
name = Debug;
@@ -795,7 +801,7 @@
795801
PRODUCT_BUNDLE_IDENTIFIER = it.chicio.Mp3ID3TaggerTests;
796802
PRODUCT_NAME = "$(TARGET_NAME)";
797803
PROVISIONING_PROFILE_SPECIFIER = "";
798-
SWIFT_VERSION = 4.0;
804+
SWIFT_VERSION = 4.2;
799805
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Mp3ID3Tagger.app/Contents/MacOS/Mp3ID3Tagger";
800806
};
801807
name = Release;

‎Mp3ID3Tagger/Base.lproj/Main.storyboard

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
56
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
6-
<capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
77
</dependencies>
88
<scenes>
99
<!--Application-->
@@ -114,7 +114,7 @@
114114
<scene sceneID="R2V-B0-nI4">
115115
<objects>
116116
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
117-
<window key="window" title="Mp3ID3Tagger" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
117+
<window key="window" title="Mp3ID3Tagger" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
118118
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
119119
<windowCollectionBehavior key="collectionBehavior" fullScreenNone="YES"/>
120120
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
@@ -146,15 +146,15 @@
146146
<rect key="frame" x="350" y="181" width="530" height="22"/>
147147
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="hHh-aK-Lvw">
148148
<font key="font" metaFont="system"/>
149-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
149+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
150150
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
151151
</textFieldCell>
152152
</textField>
153153
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DIC-4c-LPe">
154154
<rect key="frame" x="350" y="235" width="530" height="22"/>
155155
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="CjF-Nh-Rb1">
156156
<font key="font" metaFont="system"/>
157-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
157+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
158158
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
159159
</textFieldCell>
160160
</textField>
@@ -194,20 +194,20 @@
194194
<rect key="frame" x="350" y="127" width="256" height="22"/>
195195
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="gWX-tq-MB2">
196196
<font key="font" metaFont="system"/>
197-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
197+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
198198
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
199199
</textFieldCell>
200200
</textField>
201201
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wXW-XK-hdz">
202-
<rect key="frame" x="348" y="46" width="146" height="17"/>
202+
<rect key="frame" x="348" y="46" width="147" height="17"/>
203203
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Genre" id="aGl-eD-S8Z">
204204
<font key="font" metaFont="systemSemibold" size="13"/>
205205
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
206206
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
207207
</textFieldCell>
208208
</textField>
209209
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jtq-DC-Fpn">
210-
<rect key="frame" x="348" y="16" width="147" height="26"/>
210+
<rect key="frame" x="348" y="16" width="148" height="25"/>
211211
<popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="-1" imageScaling="proportionallyDown" inset="2" selectedItem="xME-wR-8N8" id="wUp-Nd-R4e">
212212
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
213213
<font key="font" metaFont="menu"/>
@@ -303,10 +303,10 @@
303303
</popUpButtonCell>
304304
</popUpButton>
305305
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YcP-Va-zfQ">
306-
<rect key="frame" x="500" y="19" width="380" height="22"/>
306+
<rect key="frame" x="501" y="19" width="379" height="22"/>
307307
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="A0p-qY-KSk">
308308
<font key="font" metaFont="system"/>
309-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
309+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
310310
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
311311
</textFieldCell>
312312
</textField>
@@ -322,13 +322,14 @@
322322
</buttonCell>
323323
</button>
324324
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5y8-bk-0av">
325-
<rect key="frame" x="348" y="286" width="57" height="26"/>
326-
<popUpButtonCell key="cell" type="push" title="2.3" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" tag="3" inset="2" selectedItem="A2P-Ht-uof" id="sKv-WB-wpR">
325+
<rect key="frame" x="348" y="286" width="58" height="25"/>
326+
<popUpButtonCell key="cell" type="push" title="2.3" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" tag="3" inset="2" selectedItem="QK0-Fi-gVy" id="sKv-WB-wpR">
327327
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
328328
<font key="font" metaFont="menu"/>
329329
<menu key="menu" id="Kxx-BI-Tez">
330330
<items>
331-
<menuItem title="2.3" state="on" tag="3" id="A2P-Ht-uof"/>
331+
<menuItem title="2.3" state="on" tag="3" id="QK0-Fi-gVy"/>
332+
<menuItem title="2.4" tag="4" id="A2P-Ht-uof"/>
332333
<menuItem title="2.2" tag="2" id="k3C-lc-hZf"/>
333334
</items>
334335
</menu>
@@ -349,7 +350,7 @@
349350
</constraints>
350351
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="2WM-zr-Kfx">
351352
<font key="font" metaFont="system"/>
352-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
353+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
353354
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
354355
</textFieldCell>
355356
<connections>
@@ -371,7 +372,7 @@
371372
</constraints>
372373
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="ckj-Ml-UM1">
373374
<font key="font" metaFont="system"/>
374-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
375+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
375376
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
376377
</textFieldCell>
377378
<connections>
@@ -393,7 +394,7 @@
393394
</constraints>
394395
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="ghC-RN-kKp">
395396
<font key="font" metaFont="system"/>
396-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
397+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
397398
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
398399
</textFieldCell>
399400
<connections>
@@ -420,7 +421,7 @@
420421
<rect key="frame" x="625" y="127" width="255" height="22"/>
421422
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="oYS-Wl-IxB">
422423
<font key="font" metaFont="system"/>
423-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
424+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
424425
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
425426
</textFieldCell>
426427
</textField>

‎Mp3ID3Tagger/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.2.1</string>
20+
<string>1.2.2</string>
2121
<key>CFBundleVersion</key>
2222
<string>1</string>
2323
<key>LSMinimumSystemVersion</key>

‎Mp3ID3TaggerTests/ViewModel/Form/Fields/VersionFieldTest.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class VersionFieldTest: XCTestCase {
1717
func testVersionFieldSetupWithValidValue() {
1818
let disposeBag = DisposeBag()
1919
let testScheduler = TestScheduler(initialClock: 0)
20-
let mockVersionObserver = testScheduler.createHotObservable([next(5, 2), next(10, 3)])
20+
let mockVersionObserver = testScheduler.createHotObservable([next(5, 2), next(10, 3), next(10, 4)])
2121
let observer = testScheduler.createObserver(ID3Version.self)
2222

2323
let versionField = VersionField()
@@ -30,10 +30,11 @@ class VersionFieldTest: XCTestCase {
3030
testScheduler.start()
3131

3232
let result: [ID3Version] = observer.events.map { $0.value.element! }
33-
let expectedResult: [ID3Version] = [.version3, .version2, .version3]
33+
let expectedResult: [ID3Version] = [.version3, .version2, .version3, .version4]
3434

3535
XCTAssertEqual(result[0], expectedResult[0])
3636
XCTAssertEqual(result[1], expectedResult[1])
3737
XCTAssertEqual(result[2], expectedResult[2])
38+
XCTAssertEqual(result[3], expectedResult[3])
3839
}
3940
}

‎Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :osx, '10.13'
44
def commonPods
55
pod 'RxSwift', '~> 4.0'
66
pod 'RxCocoa', '~> 4.0'
7-
pod 'ID3TagEditor', '~> 2.1.0'
7+
pod 'ID3TagEditor', '~> 2.2.0'
88
end
99

1010
target 'Mp3ID3Tagger' do

‎Podfile.lock

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
PODS:
2-
- ID3TagEditor (2.1.0)
3-
- RxBlocking (4.1.2):
2+
- ID3TagEditor (2.2.0)
3+
- RxAtomic (4.4.0)
4+
- RxBlocking (4.4.0):
5+
- RxAtomic (~> 4.4)
46
- RxSwift (~> 4.0)
5-
- RxCocoa (4.1.2):
7+
- RxCocoa (4.4.0):
68
- RxSwift (~> 4.0)
7-
- RxSwift (4.1.2)
8-
- RxTest (4.1.2):
9+
- RxSwift (4.4.0):
10+
- RxAtomic (~> 4.4)
11+
- RxTest (4.4.0):
12+
- RxAtomic (~> 4.4)
913
- RxSwift (~> 4.0)
1014

1115
DEPENDENCIES:
12-
- ID3TagEditor (~> 2.1.0)
16+
- ID3TagEditor (~> 2.2.0)
1317
- RxBlocking (~> 4.0)
1418
- RxCocoa (~> 4.0)
1519
- RxSwift (~> 4.0)
@@ -18,18 +22,20 @@ DEPENDENCIES:
1822
SPEC REPOS:
1923
https://github.com/cocoapods/specs.git:
2024
- ID3TagEditor
25+
- RxAtomic
2126
- RxBlocking
2227
- RxCocoa
2328
- RxSwift
2429
- RxTest
2530

2631
SPEC CHECKSUMS:
27-
ID3TagEditor: ed2759f633841400a4375885e51694344d431780
28-
RxBlocking: f6054985901412fc8c02daa84e92d4ba68c61389
29-
RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a
30-
RxSwift: e49536837d9901277638493ea537394d4b55f570
31-
RxTest: e634f15fd2c2cd0e0120132ef7a4f7be69ad0393
32+
ID3TagEditor: 9ac1b6654cc273628a4a4f479ced83742bb429a7
33+
RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
34+
RxBlocking: 138ad53217434444d6eeeb4fb406a45431d92e31
35+
RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
36+
RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
37+
RxTest: 19d03286bdc0a3aaea5d61d4cde31fdf4bb8a5ba
3238

33-
PODFILE CHECKSUM: 8e0371195dda5a9fdd503174fb0557aff2481b99
39+
PODFILE CHECKSUM: 277fc3760777ecd6a0f600d6f97cc63100d6854c
3440

3541
COCOAPODS: 1.5.3

0 commit comments

Comments
 (0)