Skip to content

Commit f318d78

Browse files
v-grigorievv-grigoriev
authored
Merge pull request #36 from gorastudio/develop
Develop
2 parents dde9867 + 0c4b210 commit f318d78

File tree

64 files changed

+1481
-900
lines changed

Some content is hidden

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

64 files changed

+1481
-900
lines changed

‎.gitignore‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ playground.xcworkspace
7474
# Carthage
7575
#
7676
# Add this line if you want to avoid checking in source code from Carthage dependencies.
77-
# Carthage/Checkouts
77+
Carthage/Checkouts
7878
Carthage/Build
7979
# fastlane
8080
#
@@ -90,4 +90,11 @@ fastlane/test_output
9090
#
9191
# After new code Injection tools there's a generated folder /iOSInjectionProject
9292
# https://github.com/johnno1962/injectionforxcode
93-
iOSInjectionProject/
93+
iOSInjectionProject/
94+
95+
.DS_Store
96+
/.build
97+
/Packages
98+
xcuserdata/
99+
DerivedData/
100+
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

‎Cartfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "v-grigoriev/MulticastDelegate"

‎Cartfile.resolved‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "v-grigoriev/MulticastDelegate" "1.0.1"

‎Example/Example.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@
560560
"$(inherited)",
561561
"@executable_path/Frameworks",
562562
);
563-
MARKETING_VERSION = 2.6.0;
563+
MARKETING_VERSION = 2.7.0;
564564
PRODUCT_BUNDLE_IDENTIFIER = "gora.studio.SCNRecorder.Example.${DEVELOPMENT_TEAM}";
565565
PRODUCT_NAME = "$(TARGET_NAME)";
566566
SWIFT_OBJC_BRIDGING_HEADER = "Source/Example-Bridging-Header.h";
@@ -585,7 +585,7 @@
585585
"$(inherited)",
586586
"@executable_path/Frameworks",
587587
);
588-
MARKETING_VERSION = 2.6.0;
588+
MARKETING_VERSION = 2.7.0;
589589
PRODUCT_BUNDLE_IDENTIFIER = "gora.studio.SCNRecorder.Example.${DEVELOPMENT_TEAM}";
590590
PRODUCT_NAME = "$(TARGET_NAME)";
591591
SWIFT_OBJC_BRIDGING_HEADER = "Source/Example-Bridging-Header.h";

‎Example/Podfile.lock‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
PODS:
2-
- SCNRecorder (2.6.0)
2+
- MTDMulticastDelegate (1.0.0)
3+
- SCNRecorder (2.7.0):
4+
- MTDMulticastDelegate
35
- SnapKit (5.0.1)
46

57
DEPENDENCIES:
@@ -8,16 +10,18 @@ DEPENDENCIES:
810

911
SPEC REPOS:
1012
trunk:
13+
- MTDMulticastDelegate
1114
- SnapKit
1215

1316
EXTERNAL SOURCES:
1417
SCNRecorder:
1518
:path: "../"
1619

1720
SPEC CHECKSUMS:
18-
SCNRecorder: f73f8fcf890a0595081d09b9074ed7fbd9df84cb
21+
MTDMulticastDelegate: 4cd6b89c670e210071ac1914cdfd489eee4f64a5
22+
SCNRecorder: f1891098c0ea72fe166a1c10fc2e5a4e3dd8c9a5
1923
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
2024

2125
PODFILE CHECKSUM: a402c811b8b6a231a13402257d93acd3b67abb0d
2226

23-
COCOAPODS: 1.10.1
27+
COCOAPODS: 1.11.2

‎Example/Pods/Local Podspecs/SCNRecorder.podspec.json‎

Lines changed: 8 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/MTDMulticastDelegate/LICENSE.md‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/MTDMulticastDelegate/README.md‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/Helpers/MulticastDelegate/SCNRecorderMulticastDelegate.m renamed to Example/Pods/MTDMulticastDelegate/Sources/MulticastDelegate/MTDMulticastDelegate.m

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/Helpers/MulticastDelegate/SCNRecorderOriginMulticastDelegate.m renamed to Example/Pods/MTDMulticastDelegate/Sources/MulticastDelegate/MTDOriginMulticastDelegate.m

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)