Skip to content

Commit 46debd3

Browse files
insideguiinsidegui
authored
Merge pull request insidegui#592 from insidegui/2020hotfix
Fixes 2020 feed issues
2 parents d86e364 + 78971a7 commit 46debd3

File tree

9 files changed

+58
-20
lines changed

9 files changed

+58
-20
lines changed

‎Cartfile.resolved‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
github "ReactiveX/RxSwift" "5.0.1"
1+
github "ReactiveX/RxSwift" "5.1.1"
22
github "RxSwiftCommunity/RxRealm" "1.0.1"
33
github "SwiftyJSON/SwiftyJSON" "4.3.0"
4-
github "apple/swift-protobuf" "1.7.0"
5-
github "bustoutsolutions/siesta" "1.4.3"
4+
github "apple/swift-protobuf" "1.8.0"
5+
github "bustoutsolutions/siesta" "1.5.0"
66
github "insidegui/ChromeCastCore" "0.2.1"
77
github "insidegui/CloudKitCodable" "0.1.4"
88
github "realm/realm-cocoa" "v3.21.0"
9-
github "sparkle-project/Sparkle" "1.22.0"
9+
github "sparkle-project/Sparkle" "v1.23.0"

‎ConfCore/Environment.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extension Environment {
105105
liveVideosPath: "/videos_live.json",
106106
featuredSectionsPath: "/_featured.json")
107107

108-
public static let production = Environment(baseURL: "https://api2018.wwdc.io",
108+
public static let production = Environment(baseURL: "https://red-fire-a9a4.rambo.workers.dev",
109109
videosPath: "/videos.json",
110110
sessionsPath: "/contents.json",
111111
newsPath: "/news.json",

‎Releases/WWDC_latest.zip‎

404 KB
Binary file not shown.

‎Releases/appcast_v5.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,33 @@
66
<description>Most recent changes with links to updates.</description>
77
<language>en</language>
88

9+
<item>
10+
<title>Version 6.2</title>
11+
<description><![CDATA[
12+
<ul>
13+
<li>The app is now notarized</li>
14+
<li>Adds a number of keyboard shortcuts:</li>
15+
<ul>
16+
<li>Increase/reduce playback speed with plus or minus keys respectively</li>
17+
<li>Increase reverse speed/pause/increase forward speed with J/K/L respectively</li>
18+
</ul>
19+
<li>Section headers categorising sessions into Tracks now show when filters and searches are active</li>
20+
<li>Improvements to the control overlay when viewing videos:</li>
21+
<ul>
22+
<li>Increased contrast</li>
23+
<li>Fixes two issues which saw the control overlay stay on-screen when the mouse was not focused on the video</li>
24+
</ul>
25+
<li>Fixes an issue in which some related sessions were not shown</li>
26+
<li>Fixes an issue with transcripts</li>
27+
<li>Fixes a networking alert which was shown too readily</li>
28+
<li>Fixes an issue which affected users who cancelled when changing their download directory</li>
29+
</ul>
30+
]]></description>
31+
<pubDate>Mon, 06 Apr 2020 14:00:00 -0300</pubDate>
32+
<enclosure url="https://github.com/insidegui/WWDC/releases/download/6.2/WWDC_v6.2.zip" sparkle:version="922" sparkle:shortVersionString="6.2" length="14221167" type="application/octet-stream" />
33+
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
34+
</item>
35+
936
<item>
1037
<title>Version 6.1.2</title>
1138
<description><![CDATA[

‎WWDC.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,6 @@
16761676
CreatedOnToolsVersion = 8.2.1;
16771677
DevelopmentTeam = 8C7439RJLG;
16781678
LastSwiftMigration = 1000;
1679-
ProvisioningStyle = Manual;
16801679
SystemCapabilities = {
16811680
com.apple.HardenedRuntime = {
16821681
enabled = 1;
@@ -1824,7 +1823,7 @@
18241823
};
18251824
DD55E73522AC2958004BBA7A /* Fix Sparkle for notarization */ = {
18261825
isa = PBXShellScriptBuildPhase;
1827-
buildActionMask = 2147483647;
1826+
buildActionMask = 8;
18281827
files = (
18291828
);
18301829
inputFileListPaths = (
@@ -1836,7 +1835,7 @@
18361835
);
18371836
outputPaths = (
18381837
);
1839-
runOnlyForDeploymentPostprocessing = 0;
1838+
runOnlyForDeploymentPostprocessing = 1;
18401839
shellPath = /bin/sh;
18411840
shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ] || [ \"${CODE_SIGN_IDENTITY}\" = \"\" ] ; then\necho \"Skipping because we're in a debug build or couldn't find code signing ID.\"\nexit 0\nfi\n\nCARTHAGE_BUILD_MAC_DIR=\"${PROJECT_DIR}/Carthage/Build/Mac\"\nSPARKLE_AUTOUPDATE_PATH=\"${CARTHAGE_BUILD_MAC_DIR}/Sparkle.framework/Resources/Autoupdate.app\"\ncodesign --force --deep -o runtime --sign \"$CODE_SIGN_IDENTITY\" \"$SPARKLE_AUTOUPDATE_PATH\"\n";
18421841
};
@@ -2277,6 +2276,7 @@
22772276
CODE_SIGN_ENTITLEMENTS = WWDC/WWDC.entitlements;
22782277
CODE_SIGN_IDENTITY = "";
22792278
COMBINE_HIDPI_IMAGES = YES;
2279+
CURRENT_PROJECT_VERSION = 922;
22802280
DEVELOPMENT_TEAM = 8C7439RJLG;
22812281
ENABLE_HARDENED_RUNTIME = NO;
22822282
FRAMEWORK_SEARCH_PATHS = (
@@ -2289,6 +2289,7 @@
22892289
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
22902290
LIBRARY_SEARCH_PATHS = "$(inherited)";
22912291
MACOSX_DEPLOYMENT_TARGET = 10.13;
2292+
MARKETING_VERSION = 6.2;
22922293
PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app;
22932294
PRODUCT_NAME = "$(TARGET_NAME)";
22942295
PROVISIONING_PROFILE_SPECIFIER = "WWDC Debug 2019";
@@ -2307,6 +2308,7 @@
23072308
CODE_SIGN_IDENTITY = "";
23082309
COMBINE_HIDPI_IMAGES = YES;
23092310
COPY_PHASE_STRIP = YES;
2311+
CURRENT_PROJECT_VERSION = 922;
23102312
DEVELOPMENT_TEAM = 8C7439RJLG;
23112313
ENABLE_HARDENED_RUNTIME = NO;
23122314
FRAMEWORK_SEARCH_PATHS = (
@@ -2319,6 +2321,7 @@
23192321
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
23202322
LIBRARY_SEARCH_PATHS = "$(inherited)";
23212323
MACOSX_DEPLOYMENT_TARGET = 10.13;
2324+
MARKETING_VERSION = 6.2;
23222325
PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app;
23232326
PRODUCT_NAME = "$(TARGET_NAME)";
23242327
PROVISIONING_PROFILE_SPECIFIER = "WWDC Release 2019 B";
@@ -2491,8 +2494,10 @@
24912494
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
24922495
CLANG_ENABLE_MODULES = YES;
24932496
CODE_SIGN_ENTITLEMENTS = WWDC/WWDC.entitlements;
2494-
CODE_SIGN_IDENTITY = "Developer ID Application: GUILHERME RAMBO (8C7439RJLG)";
2497+
CODE_SIGN_IDENTITY = "Apple Development";
2498+
CODE_SIGN_STYLE = Automatic;
24952499
COMBINE_HIDPI_IMAGES = YES;
2500+
CURRENT_PROJECT_VERSION = 922;
24962501
DEVELOPMENT_TEAM = 8C7439RJLG;
24972502
ENABLE_HARDENED_RUNTIME = NO;
24982503
FRAMEWORK_SEARCH_PATHS = (
@@ -2505,11 +2510,11 @@
25052510
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
25062511
LIBRARY_SEARCH_PATHS = "$(inherited)";
25072512
MACOSX_DEPLOYMENT_TARGET = 10.13;
2513+
MARKETING_VERSION = 6.2;
25082514
OTHER_SWIFT_FLAGS = "-D ICLOUD";
25092515
PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app;
25102516
PRODUCT_NAME = "$(TARGET_NAME)";
2511-
PROVISIONING_PROFILE = "605da31a-abf0-4ee3-84f3-c1169196f3d1";
2512-
PROVISIONING_PROFILE_SPECIFIER = "WWDC Dev 2020";
2517+
PROVISIONING_PROFILE_SPECIFIER = "";
25132518
SWIFT_OBJC_BRIDGING_HEADER = "WWDC/WWDC-Bridging-Header.h";
25142519
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
25152520
};
@@ -2657,8 +2662,10 @@
26572662
CLANG_ENABLE_MODULES = YES;
26582663
CODE_SIGN_ENTITLEMENTS = WWDC/WWDC.entitlements;
26592664
CODE_SIGN_IDENTITY = "Developer ID Application: GUILHERME RAMBO (8C7439RJLG)";
2665+
CODE_SIGN_STYLE = Manual;
26602666
COMBINE_HIDPI_IMAGES = YES;
26612667
COPY_PHASE_STRIP = YES;
2668+
CURRENT_PROJECT_VERSION = 922;
26622669
DEVELOPMENT_TEAM = 8C7439RJLG;
26632670
ENABLE_HARDENED_RUNTIME = YES;
26642671
FRAMEWORK_SEARCH_PATHS = (
@@ -2671,10 +2678,10 @@
26712678
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
26722679
LIBRARY_SEARCH_PATHS = "$(inherited)";
26732680
MACOSX_DEPLOYMENT_TARGET = 10.13;
2681+
MARKETING_VERSION = 6.2;
26742682
OTHER_SWIFT_FLAGS = "-D ICLOUD";
26752683
PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app;
26762684
PRODUCT_NAME = "$(TARGET_NAME)";
2677-
PROVISIONING_PROFILE = "2adae370-6e55-4123-9dcf-25406dfab9ca";
26782685
PROVISIONING_PROFILE_SPECIFIER = "WWDC Prod 2020";
26792686
SWIFT_OBJC_BRIDGING_HEADER = "WWDC/WWDC-Bridging-Header.h";
26802687
};

‎WWDC.xcodeproj/xcshareddata/xcschemes/WWDC.xcscheme‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@
7777
argument = "-WWDCUseDebugStorage YES"
7878
isEnabled = "YES">
7979
</CommandLineArgument>
80+
<CommandLineArgument
81+
argument = "-WWDCEnvironmentBaseURL &quot;https://red-fire-a9a4.rambo.workers.dev&quot;"
82+
isEnabled = "YES">
83+
</CommandLineArgument>
8084
<CommandLineArgument
8185
argument = "--disable-transcripts"
8286
isEnabled = "NO">

‎WWDC.xcodeproj/xcshareddata/xcschemes/WWDC_iCloud.xcscheme‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
isEnabled = "YES">
8181
</CommandLineArgument>
8282
<CommandLineArgument
83-
argument = "-WWDCEnvironmentBaseURL https://wwdc-staging.orangebox.app"
84-
isEnabled = "NO">
83+
argument = "-WWDCEnvironmentBaseURL &quot;https://red-fire-a9a4.rambo.workers.dev&quot;"
84+
isEnabled = "YES">
8585
</CommandLineArgument>
8686
<CommandLineArgument
8787
argument = "--enable-updates"
@@ -93,7 +93,7 @@
9393
</CommandLineArgument>
9494
<CommandLineArgument
9595
argument = "--disable-transcripts"
96-
isEnabled = "NO">
96+
isEnabled = "YES">
9797
</CommandLineArgument>
9898
<CommandLineArgument
9999
argument = "--prefs"

‎WWDC/AppCoordinator.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,15 @@ final class AppCoordinator {
257257
// Initial app launch waits for all of these things to be loaded before dismissing the primary loading spinner
258258
// It may, however, delay the presentation of content on tabs that already have everything they need
259259

260-
let starupDependencies = Observable.combineLatest(storage.tracksObservable,
260+
let startupDependencies = Observable.combineLatest(storage.tracksObservable,
261261
storage.eventsObservable,
262262
storage.focusesObservable,
263263
storage.scheduleObservable,
264264
storage.featuredSectionsObservable)
265265

266-
starupDependencies
266+
startupDependencies
267267
.filter {
268-
!$0.0.isEmpty && !$0.1.isEmpty && !$0.2.isEmpty && !$0.3.isEmpty && !$0.4.isEmpty
268+
!$0.0.isEmpty && !$0.1.isEmpty && !$0.2.isEmpty && !$0.4.isEmpty
269269
}
270270
.take(1)
271271
.subscribe(onNext: { [weak self] tracks, _, _, sections, _ in

‎WWDC/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>6.1.3</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleURLTypes</key>
2020
<array>
2121
<dict>
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>920</string>
39+
<string>$(CURRENT_PROJECT_VERSION)</string>
4040
<key>Fabric</key>
4141
<dict>
4242
<key>APIKey</key>

0 commit comments

Comments
 (0)