Merged with master

insidegui · insidegui · commit 025a1c017f2b · 2023-05-29T14:05:34.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,5 @@ DerivedData
 generatechangelog.sh
 Pods/
 Carthage
-Provisioning
+Provisioning
+TeamID.xcconfig
diff --git a/Packages/ConfCore/ConfCore/ConfCoreExports.swift b/Packages/ConfCore/ConfCore/ConfCoreExports.swift
@@ -8,8 +8,5 @@
 
 @_exported import Foundation
 @_exported import RealmSwift
-@_exported import RxSwift
-@_exported import RxCocoa
-@_exported import RxRealm
 @_exported import Siesta
 @_exported import Transcripts
diff --git a/WWDC.xcodeproj/project.pbxproj b/WWDC.xcodeproj/project.pbxproj
diff --git a/WWDC/AppCoordinator+Bookmarks.swift b/WWDC/AppCoordinator+Bookmarks.swift
@@ -9,10 +9,7 @@
 import Cocoa
 import AVFoundation
 import PlayerUI
-import RxSwift
-import RxCocoa
 import RealmSwift
-import RxRealm
 import ConfCore
 
 extension AppCoordinator: PUITimelineDelegate, VideoPlayerViewControllerDelegate {
diff --git a/WWDC/AppCoordinator+SessionActions.swift b/WWDC/AppCoordinator+SessionActions.swift
@@ -8,7 +8,6 @@
 
 import Cocoa
 import RealmSwift
-import RxSwift
 import ConfCore
 import PlayerUI
 import EventKit
diff --git a/WWDC/AppCoordinator+SessionTableViewContextMenuActions.swift b/WWDC/AppCoordinator+SessionTableViewContextMenuActions.swift
@@ -8,7 +8,6 @@
 
 import Cocoa
 import RealmSwift
-import RxSwift
 import ConfCore
 import PlayerUI
 
diff --git a/WWDC/AppCoordinator+Shelf.swift b/WWDC/AppCoordinator+Shelf.swift
@@ -8,7 +8,6 @@
 
 import Cocoa
 import RealmSwift
-import RxSwift
 import ConfCore
 import PlayerUI
 import CoreMedia
diff --git a/WWDC/AppCoordinator+UserActivity.swift b/WWDC/AppCoordinator+UserActivity.swift
@@ -8,7 +8,6 @@
 
 import Cocoa
 import RealmSwift
-import RxSwift
 import ConfCore
 import PlayerUI
 
diff --git a/WWDC/ExploreTabProvider.swift b/WWDC/ExploreTabProvider.swift
@@ -2,6 +2,7 @@ import Cocoa
 import SwiftUI
 import Combine
 import ConfCore
+import RxSwift
 
 final class ExploreTabProvider: ObservableObject {
     let storage: Storage
diff --git a/WWDC/Main.xcconfig b/WWDC/Main.xcconfig
@@ -1,3 +1,7 @@
+// If you see this error: "could not find included file 'TeamID.xcconfig' in search paths"
+// Make sure you have run the bootstrap script from the project's root directory to set up signing for your team ID.
+#include "TeamID.xcconfig"
+
 MARKETING_VERSION = 7.4
 CURRENT_PROJECT_VERSION = 1030
 
@@ -6,3 +10,5 @@ MACOSX_DEPLOYMENT_TARGET = 12.0
 VERSIONING_SYSTEM = apple-generic
 
 COPYRIGHT=© 2017-2023 Buddy Software LTD
+
+CODE_SIGN_STYLE = Automatic
diff --git a/WWDC/OpenSource.xcconfig b/WWDC/OpenSource.xcconfig
@@ -0,0 +1,6 @@
+#include "Main.xcconfig"
+
+// Once you set your project's development team,
+// you'll have a unique bundle identifier. This is because the bundle identifier
+// is derived based on the 'SAMPLE_CODE_DISAMBIGUATOR' value.
+SAMPLE_CODE_DISAMBIGUATOR=${DEVELOPMENT_TEAM}
diff --git a/WWDC/PreferencesCoordinator.swift b/WWDC/PreferencesCoordinator.swift
@@ -7,8 +7,6 @@
 //
 
 import Cocoa
-import RxCocoa
-import RxSwift
 import ConfCore
 
 enum PreferencesTab: Int, WWDCTab {
@@ -18,8 +16,6 @@ enum PreferencesTab: Int, WWDCTab {
 
 final class PreferencesCoordinator {
 
-    private let disposeBag = DisposeBag()
-
     private let windowController: PreferencesWindowController
 
     private let tabController: WWDCTabViewController<PreferencesTab>
diff --git a/WWDC/RelatedSessionsViewController.swift b/WWDC/RelatedSessionsViewController.swift
@@ -7,8 +7,6 @@
 //
 
 import Cocoa
-import RxSwift
-import RxCocoa
 
 private extension NSUserInterfaceItemIdentifier {
     static let sessionItem = NSUserInterfaceItemIdentifier("sessionCell")
@@ -37,8 +35,6 @@ final class RelatedSessionsViewController: NSViewController {
         static let padding: CGFloat = 24
     }
 
-    private let disposeBag = DisposeBag()
-
     var sessions: [SessionViewModel] = [] {
         didSet {
             collectionView.reloadData()
diff --git a/WWDC/SessionDetailsViewController.swift b/WWDC/SessionDetailsViewController.swift
@@ -7,17 +7,13 @@
 //
 
 import Cocoa
-import RxSwift
-import RxCocoa
 
 final class SessionDetailsViewController: WWDCWindowContentViewController {
 
     private struct Metrics {
         static let padding: CGFloat = 46
     }
 
-    private let disposeBag = DisposeBag()
-
     let listStyle: SessionsListStyle
 
     var viewModel: SessionViewModel? {
diff --git a/WWDC/SessionTableCellView.swift b/WWDC/SessionTableCellView.swift
@@ -7,8 +7,6 @@
 //
 
 import Cocoa
-import RxSwift
-import RxCocoa
 
 final class SessionTableCellView: NSTableCellView {
 
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -3,6 +3,10 @@ if [[ ${CI} ]]; then
     echo -en '\033[33;1mBootstrap\033[0m travis_fold:start:bootstrap\\r'
 fi
 
+echo ""
+
+./teamid.sh
+
 lessThanOrEqual() {
     [  "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
 }
@@ -45,5 +49,4 @@ if ! $SWIFTLINT_INSTALLED || ! $SWIFTLINT_UPDATED; then
     fi
 fi
 
-echo "All done"
-xed .
+echo "All done"
diff --git a/teamid.sh b/teamid.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+TEAM_ID_FILE=WWDC/TeamID.xcconfig
+
+function print_team_ids() {
+  echo ""
+  echo "FYI, here are the team IDs found in your Xcode preferences:"
+  echo ""
+  
+  XCODEPREFS="$HOME/Library/Preferences/com.apple.dt.Xcode.plist"
+  TEAM_KEYS=(`/usr/libexec/PlistBuddy -c "Print :IDEProvisioningTeams" "$XCODEPREFS" | perl -lne 'print $1 if /^    (\S*) =/'`)
+  
+  for KEY in $TEAM_KEYS 
+  do
+      i=0
+      while true ; do
+          NAME=$(/usr/libexec/PlistBuddy -c "Print :IDEProvisioningTeams:$KEY:$i:teamName" "$XCODEPREFS" 2>/dev/null)
+          TEAMID=$(/usr/libexec/PlistBuddy -c "Print :IDEProvisioningTeams:$KEY:$i:teamID" "$XCODEPREFS" 2>/dev/null)
+          
+          if [ $? -ne 0 ]; then
+              break
+          fi
+          
+          echo "$TEAMID - $NAME"
+          
+          i=$(($i + 1))
+      done
+  done
+}
+
+if [ -z "$1" ]; then
+  print_team_ids
+  echo ""
+  echo "> What is your Apple Developer Team ID? (looks like 1A23BDCD)"
+  read TEAM_ID
+else
+  TEAM_ID=$1
+fi
+
+if [ -z "$TEAM_ID" ]; then
+  echo "You must enter a team id"
+  print_team_ids
+  exit 1
+fi
+
+echo "Setting team ID to $TEAM_ID"
+
+echo "// This file was automatically generated, do not edit directly." > $TEAM_ID_FILE
+echo "" >> $TEAM_ID_FILE
+echo "DEVELOPMENT_TEAM=$TEAM_ID" >> $TEAM_ID_FILE
+
+echo ""
+echo "Successfully generated configuration at $TEAM_ID_FILE, you may now build the app using the \"WWDC\" target"
+echo "You may need to close and re-open the project in Xcode if it's already open"
+echo ""
