Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[shared_preferences] Merge iOS and macOS implementations #6920

Merged
stuartmorgan-g merged 15 commits into from
Jan 10, 2023
Merged

[shared_preferences] Merge iOS and macOS implementations #6920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0a0da83
File renames; no changes
stuartmorgan-g Jan 6, 2023
8196bed
Exclude new plugin from build-all during the transition
stuartmorgan-g Jan 6, 2023
4abfa03
Rename files and classes, update metadata
stuartmorgan-g Jan 6, 2023
d598043
Move implementation to shared location
stuartmorgan-g Jan 6, 2023
4fbe5fa
IGNORE IN REVIEW add symlinks
stuartmorgan-g Jan 6, 2023
ca6fcab
Add iOS support
stuartmorgan-g Jan 6, 2023
a0f8792
Add an iOS example freshly created from the template
stuartmorgan-g Jan 6, 2023
78d1cfd
Move the native test to a shared location
stuartmorgan-g Jan 6, 2023
7f00f3f
Update to use shared test file
stuartmorgan-g Jan 6, 2023
38aa945
Automatic changes from running example
stuartmorgan-g Jan 6, 2023
1748b4b
Remove shared_preferences_ios
stuartmorgan-g Jan 6, 2023
61ccdad
Update CODEOWNERS
stuartmorgan-g Jan 6, 2023
1156773
Add copyright header to example files
stuartmorgan-g Jan 6, 2023
abc13e6
Revert auto-update of macOS target
stuartmorgan-g Jan 6, 2023
9b86d03
Add missing copyright header
stuartmorgan-g Jan 6, 2023
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
Prev Previous commit
Next Next commit
Update to use shared test file
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed Jan 6, 2023
commit 7f00f3f4f0cab134737c47ce5347a6dbcc38c8ad
8 changes: 7 additions & 1 deletion packages/shared_preferences/shared_preferences_foundation/darwin/Tests/RunnerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import FlutterMacOS
import XCTest

#if os(iOS)
import Flutter
#elseif os(macOS)
import FlutterMacOS
#endif

@testable import shared_preferences_foundation

class RunnerTests: XCTestCase {
Expand Down
2 changes: 1 addition & 1 deletion ...ed_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ../../../darwin/Tests/RunnerTests.swift; sourceTree = "<group>"; };
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand Down
26 changes: 0 additions & 26 deletions ...hared_preferences/shared_preferences_foundation/example/ios/RunnerTests/RunnerTests.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ..._preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
33EBD39826727BD10013E557 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
33EBD39A26727BD10013E557 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
33EBD39A26727BD10013E557 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ../../../darwin/Tests/RunnerTests.swift; sourceTree = "<group>"; };
33EBD39C26727BD10013E557 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5067D74CB28D28AE3B3DD05B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
53F020549CA1E801ACA3428F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
Expand Down