Skip to content

Commit

Permalink
Merge pull request #39 from soucolline/develop
Browse files Browse the repository at this point in the history
Version 2.1.0
  • Loading branch information
soucolline authored Aug 7, 2022
2 parents a860f92 + ce60011 commit 26f4ad7
Show file tree
Hide file tree
Showing 42 changed files with 957 additions and 1,229 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@ swiftUVTests/GeneratedMocks.swift

# Secrets
.env.default
.DS_Store
11 changes: 1 addition & 10 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,7 @@ target 'swiftUV' do
use_frameworks!

# Pods for swiftUV
pod 'SwiftLint', '= 0.40.3'
pod 'ZLogger', '= 1.1.0'
pod 'Resolver', '= 1.1.4'
pod 'ExytePopupView', '= 0.0.10'
pod 'Bugsnag'
end

target 'swiftUVTests' do
use_frameworks!
pod 'Cuckoo', '= 1.4.1'
pod 'SwiftLint', '= 0.48.0'
end

plugin 'cocoapods-keys', {
Expand Down
32 changes: 5 additions & 27 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,45 +1,23 @@
PODS:
- Bugsnag (5.22.2)
- Cuckoo (1.4.1):
- Cuckoo/Swift (= 1.4.1)
- Cuckoo/Swift (1.4.1)
- ExytePopupView (0.0.10)
- Keys (1.0.1)
- Resolver (1.1.4)
- SwiftLint (0.40.3)
- ZLogger (1.1.0)
- SwiftLint (0.48.0)

DEPENDENCIES:
- Bugsnag
- Cuckoo (= 1.4.1)
- ExytePopupView (= 0.0.10)
- Keys (from `Pods/CocoaPodsKeys`)
- Resolver (= 1.1.4)
- SwiftLint (= 0.40.3)
- ZLogger (= 1.1.0)
- SwiftLint (= 0.48.0)

SPEC REPOS:
trunk:
- Bugsnag
- Cuckoo
- ExytePopupView
- Resolver
- SwiftLint
- ZLogger

EXTERNAL SOURCES:
Keys:
:path: Pods/CocoaPodsKeys

SPEC CHECKSUMS:
Bugsnag: 3e9e2b563f1e99ce447de123c65e851bd109fa9f
Cuckoo: 4625f7f54d9bb880123270e8969898d6c1d036b5
ExytePopupView: 14a98f924a7201bc5492e2a961da11045b17eca8
Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
Resolver: 1f4c046255cbadfa97094692e16e940d4329779f
SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
ZLogger: d53f23ce00f0f94a97271495f9f2957e5255938f
SwiftLint: 284cea64b6187c5d6bd83e9a548a64104d546447

PODFILE CHECKSUM: f40c331718a023a0e25457206562975d769fd478
PODFILE CHECKSUM: 05532806187603e2d3d823648e92d6ec2366b8e7

COCOAPODS: 1.9.3
COCOAPODS: 1.11.3
332 changes: 130 additions & 202 deletions swiftUV.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

12 changes: 1 addition & 11 deletions swiftUV.xcodeproj/xcshareddata/xcschemes/swiftUV.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
LastUpgradeVersion = "1340"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -48,16 +48,6 @@
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EBDA88921FAE5C89009514AB"
BuildableName = "swiftUVTests.xctest"
BlueprintName = "swiftUVTests"
ReferencedContainer = "container:swiftUV.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
52 changes: 52 additions & 0 deletions swiftUV.xcodeproj/xcshareddata/xcschemes/swiftUVTests.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EBDA88921FAE5C89009514AB"
BuildableName = "swiftUVTests.xctest"
BlueprintName = "swiftUVTests"
ReferencedContainer = "container:swiftUV.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
8 changes: 8 additions & 0 deletions swiftUV.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
86 changes: 86 additions & 0 deletions swiftUV.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"pins" : [
{
"identity" : "bugsnag-cocoa",
"kind" : "remoteSourceControl",
"location" : "https://github.com/bugsnag/bugsnag-cocoa",
"state" : {
"revision" : "1a5afefae616dbafcab3ad93c8bed0db1c841bc0",
"version" : "6.21.0"
}
},
{
"identity" : "combine-schedulers",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "0ba3a562716efabb585ccb169450c5389107286b",
"version" : "0.6.0"
}
},
{
"identity" : "composable-core-location",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/composable-core-location",
"state" : {
"revision" : "95d45d71a4e9c21bd97b02189d2d8342d41ea527",
"version" : "0.2.0"
}
},
{
"identity" : "swift-case-paths",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-case-paths",
"state" : {
"revision" : "a09839348486db8866f85a727b8550be1d671c50",
"version" : "0.9.1"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "48254824bb4248676bf7ce56014ff57b142b77eb",
"version" : "1.0.2"
}
},
{
"identity" : "swift-composable-architecture",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-composable-architecture",
"state" : {
"revision" : "0a38f2c860a64a005afeb8a6fe186eb2818c9a3f",
"version" : "0.38.3"
}
},
{
"identity" : "swift-custom-dump",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-custom-dump",
"state" : {
"revision" : "21ec1d717c07cea5a026979cb0471dd95c7087e7",
"version" : "0.5.0"
}
},
{
"identity" : "swift-identified-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-identified-collections",
"state" : {
"revision" : "2d6b7ffcc67afd9077fac5e5a29bcd6d39b71076",
"version" : "0.4.0"
}
},
{
"identity" : "xctest-dynamic-overlay",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "ef8e14e7ce1c0c304c644c6ba365d06c468ded6b",
"version" : "0.3.3"
}
}
],
"version" : 2
}
42 changes: 42 additions & 0 deletions swiftUV/App.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//
// App.swift
// swiftUV
//
// Created by Thomas Guilleminot on 04/08/2022.
// Copyright © 2022 Thomas Guilleminot. All rights reserved.
//

import SwiftUI
import ComposableArchitecture
import Bugsnag
import Keys

@main
struct SwiftUVApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate

var body: some Scene {
WindowGroup {
ContentView(
store: Store(
initialState: AppState(),
reducer: appReducer,
environment: AppEnvironment(
uvClient: .live,
dispatchQueue: .main,
locationManager: .live
)
)
)
}
}
}

class AppDelegate: NSObject, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
#if RELEASE
Bugsnag.start(withApiKey: SwiftUVKeys().bugsnagApiKey)
#endif
return true
}
}
1 change: 1 addition & 0 deletions swiftUV/Base.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"app.label.city" = "Ville";
"app.label.unknown" = "Inconnue";
"app.label.error" = "Erreur";
"app.error.openSettings" = "Authorisez la localisation dans les paramètres";

// Messages
"app.message.downloading" = "Téléchargement des données en cours";
Expand Down
32 changes: 0 additions & 32 deletions swiftUV/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -46,38 +46,6 @@
<string>IndexUV would like to access your location to give you the UV index from your city</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>IndexUV would like to access your location to give you the UV index from your city</string>
<key>UIAppFonts</key>
<array>
<string>OpenSans-Bold.ttf</string>
<string>OpenSans-BoldItalic.ttf</string>
<string>OpenSans-ExtraBold.ttf</string>
<string>OpenSans-ExtraBoldItalic.ttf</string>
<string>OpenSans-Italic.ttf</string>
<string>OpenSans-Light.ttf</string>
<string>OpenSans-LightItalic.ttf</string>
<string>OpenSans-Regular.ttf</string>
<string>OpenSans-Semibold.ttf</string>
<string>OpenSans-SemiboldItalic.ttf</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UISceneConfigurationName</key>
<string>Default Configuration</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
</dict>
</array>
</dict>
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
Expand Down
Binary file removed swiftUV/Resources/Fonts/OpenSans-Semibold.ttf
Binary file not shown.
Loading

0 comments on commit 26f4ad7

Please sign in to comment.