Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PLAYRTS-5585 Remove AppCenter builds and distributions #499

Merged
merged 14 commits into from
Jul 2, 2024
Merged

PLAYRTS-5585 Remove AppCenter builds and distributions #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5d23fa9
PLAYRTS-5585 Remove Nighty appcenter and Beta appcenter configurations
pyby Jun 28, 2024
e443c30
PLAYRTS-5585 Update Podfile
pyby Jun 28, 2024
008e2cb
PLAYRTS-5585 Remove xcconfig files
pyby Jun 28, 2024
fdbd3bd
PLAYRTS-5585 Remove AppCenter distribution info plist properties
pyby Jun 28, 2024
481790e
PLAYRTS-5585 Clean unused plist property
pyby Jun 28, 2024
4caac6e
PLAYRTS-5585 Remove AppCenter xcconfig files
pyby Jun 28, 2024
f98df28
PLAYRTS-5585 Remove APPCENTER build variable
pyby Jun 28, 2024
e99e292
PLAYRTS-5585 Remove AppCenter build features
pyby Jun 28, 2024
dc4e5b6
PLAYRTS-5585 Remove configuration shared properties
pyby Jun 28, 2024
0e7af60
PLAYRTS-5585 Remove unused entitlements file
pyby Jun 28, 2024
aeaba9b
PLAYRTS-5585 Update configurations
pyby Jun 28, 2024
274531f
PLAYRTS-5585 Fastlane: remove AppCenter nighties and betas iOS builds
pyby Jun 28, 2024
529d52c
PLAYRTS-5585 Update configurations
pyby Jun 28, 2024
c2821e1
PLAYRTS-5585 Update configuration
pyby Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Application/Application-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<string>LongFormVideo</string>
<key>AppCenterSecret</key>
<string>$(CONFIG__APPCENTER_SECRET)</string>
<key>AppCenterURL</key>
<string>$(APPCENTER_URL)</string>
<key>AppStoreAppleId</key>
<string>$(CONFIG__APPSTORE_APPLE_ID)</string>
<key>ApplicationGroupIdentifier</key>
Expand Down Expand Up @@ -48,7 +46,6 @@
<key>CFBundleURLSchemes</key>
<array>
<string>$(COMMON__URL_SCHEME)</string>
<string>appcenter-$(CONFIG__APPCENTER_SECRET)</string>
</array>
</dict>
</array>
Expand Down
6 changes: 0 additions & 6 deletions Application/Sources/Application/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
@import AirshipCore;
@import AppCenter;
@import AppCenterCrashes;
@import AppCenterDistribute;
@import AVFoundation;
@import CarPlay;
@import Firebase;
Expand Down Expand Up @@ -207,12 +206,7 @@ - (void)setupAppCenter
return;
}

#if defined(APPCENTER)
MSACDistribute.updateTrack = MSACUpdateTrackPrivate;
[MSACAppCenter start:appCenterSecret withServices:@[ MSACCrashes.class, MSACDistribute.class ]];
#else
[MSACAppCenter start:appCenterSecret withServices:@[ MSACCrashes.class ]];
#endif
}

- (void)setupDataProvider
Expand Down
2 changes: 1 addition & 1 deletion Application/Sources/Helpers/Extensions/Bundble+PlaySRG.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extension Bundle {
}

var play_isTestFlightDistribution: Bool {
#if !DEBUG && !APPCENTER
#if !DEBUG
return (appStoreReceiptURL?.path ?? "").contains("sandboxReceipt")
#else
return false
Expand Down
41 changes: 3 additions & 38 deletions Application/Sources/Settings/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
// License information is available from the LICENSE file.
//

#if APPCENTER
import AppCenterDistribute
#endif
#if os(iOS) && (DEBUG || APPCENTER)
#if os(iOS) && DEBUG
import FLEX
#endif
import SRGAppearanceSwift
Expand Down Expand Up @@ -50,7 +47,7 @@ struct SettingsView: View {
AdvancedFeaturesSection(model: model)
ResetSection(model: model)
#endif
#if os(iOS) && (DEBUG || APPCENTER)
#if os(iOS) && DEBUG
DeveloperSection()
#endif
#if DEBUG || NIGHTLY || BETA
Expand Down Expand Up @@ -557,9 +554,6 @@ struct SettingsView: View {
}
#endif
Toggle(NSLocalizedString("Always ask user consent at launch", comment: "Always ask user consent at launch setting label"), isOn: $isAlwaysAskUserConsentAtLaunchEnabled)
#if os(iOS) && APPCENTER
VersionsAndReleaseNotesButton()
#endif
} header: {
Text(NSLocalizedString("Advanced features", comment: "Advanced features section header"))
} footer: {
Expand Down Expand Up @@ -601,35 +595,6 @@ struct SettingsView: View {
}
}

#if os(iOS) && APPCENTER
private struct VersionsAndReleaseNotesButton: View {
@State private var isSheetDisplayed = false

private var appCenterUrl: URL? {
guard let appCenterUrlString = Bundle.main.object(forInfoDictionaryKey: "AppCenterURL") as? String, !appCenterUrlString.isEmpty else {
return nil
}
return URL(string: appCenterUrlString)
}

var body: some View {
if let appCenterUrl {
Button(NSLocalizedString("Versions and release notes", comment: "Label of the button to access release notes and download internal builds (App Center)"), action: action)
.sheet(isPresented: $isSheetDisplayed) {
SafariView(url: appCenterUrl)
.ignoresSafeArea()
}
}
}

private func action() {
UserDefaults.standard.removeObject(forKey: "MSAppCenterPostponedTimestamp")
Distribute.checkForUpdate()
isSheetDisplayed = true
}
}
#endif

private struct PosterImagesSelectionCell: View {
@AppStorage(PlaySRGSettingPosterImages) private var selectedPosterImages = PosterImages.default

Expand Down Expand Up @@ -917,7 +882,7 @@ struct SettingsView: View {

// MARK: Developer section

#if os(iOS) && (DEBUG || APPCENTER)
#if os(iOS) && DEBUG
private struct DeveloperSection: View {
var body: some View {
PlaySection {
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/xcrun make -f

CONFIGURATION_REPOSITORY_URL=https://github.com/SRGSSR/playsrg-apple-configuration.git
CONFIGURATION_COMMIT_SHA1=678bad527c2540ece906499e5d2a3bf9be35f5bf
CONFIGURATION_COMMIT_SHA1=377719a97b73b7627280720c9d7d2257e2e01cf4
CONFIGURATION_FOLDER=Configuration

.PHONY: all
Expand Down
Loading