remove experimental flags

Author: luoxiu

.travis.yml

@@ -10,24 +10,11 @@ matrix:
       sudo: required
       env: 
         - SWIFT_VERSION="5.1"
-    - os: linux
-      language: generic
-      dist: xenial
-      sudo: required
-      env: 
-        - SWIFT_VERSION="5.1"
-        - CX_EXPERIMENTAL_OBSERVABLE_OBJECT="YES"
-    - os: osx
-      language: swift
-      osx_image: xcode11.1
-      env: 
-        - CX_COMBINE_IMPLEMENTATION="CombineX"
     - os: osx
       language: swift
       osx_image: xcode11.1
       env: 
         - CX_COMBINE_IMPLEMENTATION="CombineX"
-        - CX_EXPERIMENTAL_OBSERVABLE_OBJECT="YES"
     - os: osx
       language: swift
       osx_image: xcode11.1
@@ -45,6 +32,7 @@ before_install:
       eval "$(curl -sL https://raw.githubusercontent.com/kylef/swiftenv/master/docs/install.sh)";
     fi
 
+# Travis does not yet support macOS 10.15, so we have to generate an iOS project to test against `Combine`.
 script:
   - if [[ $CX_COMBINE_IMPLEMENTATION == 'Combine' ]]; then
       gem install xcpretty;

DevOpen

@@ -1,10 +1,7 @@
 #!/bin/sh
 
 # Open the project in Xcode with env variables.
-# Enable all experimental features and test against CombineX.
-
 
 export CX_COMBINE_IMPLEMENTATION="CombineX"
-export CX_EXPERIMENTAL_OBSERVABLE_OBJECT="YES"
 killall Xcode || true
 open $(dirname $0)/Package.swift

Package.resolved

@@ -12,7 +12,7 @@
       },
       {
         "package": "Nimble",
-        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "repositoryURL": "https://github.com/Quick/Nimble",
         "state": {
           "branch": null,
           "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
@@ -21,7 +21,7 @@
       },
       {
         "package": "Quick",
-        "repositoryURL": "https://github.com/Quick/Quick.git",
+        "repositoryURL": "https://github.com/Quick/Quick",
         "state": {
           "branch": null,
           "revision": "33682c2f6230c60614861dfc61df267e11a1602f",

Package.swift

@@ -16,15 +16,16 @@ let package = Package(
         .library(name: "CXShim", targets: ["CXShim"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
+        .package(url: "https://github.com/wickwirew/Runtime", from: "2.0.0"),
+        .package(url: "https://github.com/Quick/Quick", from: "2.0.0"),
         // TODO: Use "8.0.2" until https://github.com/Quick/Nimble/issues/705 is fixed.
-        .package(url: "https://github.com/Quick/Nimble.git", .exact("8.0.2")),
+        .package(url: "https://github.com/Quick/Nimble", .exact("8.0.2")),
     ],
     targets: [
         .target(name: "CXLibc"),
         .target(name: "CXUtility"),
         .target(name: "CXNamespace"),
-        .target(name: "CombineX", dependencies: ["CXLibc", "CXUtility", "CXNamespace"]),
+        .target(name: "CombineX", dependencies: ["CXLibc", "CXUtility", "CXNamespace", "Runtime"]),
         .target(name: "CXFoundation", dependencies: ["CXUtility", "CXNamespace", "CombineX"]),
         .target(name: "CXCompatible", dependencies: ["CXNamespace"]),
         .target(name: "CXShim", dependencies: [/* depends on combine implementation */]),
@@ -51,88 +52,11 @@ extension Optional where Wrapped: RangeReplaceableCollection {
     }
 }
 
-// MARK: CombineX Experimental Features
-
-/// Some of the implementations in CombineX are experimental.
-struct CXExperimentalFeatures: OptionSet, CaseIterable {
-    
-    let rawValue: Int
-    
-    static let observableObject = CXExperimentalFeatures(rawValue: 1)
-    
-    static var allCases: [CXExperimentalFeatures] {
-        return [.observableObject]
-    }
-    
-    var flags: [String] {
-        var result: [String] = []
-        if contains(.observableObject) {
-            result += ["EXPERIMENTAL_OBSERVABLE_OBJECT"]
-        }
-        return result
-    }
-    
-    func configure(_ package: Package) {
-        guard let cxTarget = package.targets.first(where: { $0.name == "CombineX" }) else { return }
-        
-        // extra package dependencies
-        package.dependencies.append(contentsOf: self.extraPackageDependencies)
-        
-        // extra swift settings
-        cxTarget.swiftSettings.append(contentsOf: self.extraSwiftSettings)
-        
-        // extra target dependencies
-        cxTarget.dependencies.append(contentsOf: self.extraTargetDependencies)
-    }
-    
-    var extraPackageDependencies: [Package.Dependency] {
-        var deps: [Package.Dependency] = []
-        if contains(.observableObject) {
-            deps += [.package(url: "https://github.com/wickwirew/Runtime", from: "2.0.0")]
-        }
-        return deps
-    }
-    
-    var extraSwiftSettings: [SwiftSetting] {
-        var settings: [SwiftSetting] = []
-        settings += self.flags.map { .define($0) }
-        return settings
-    }
-    
-    var extraTargetDependencies: [Target.Dependency] {
-        var deps: [Target.Dependency] = []
-        if contains(.observableObject) {
-            deps += ["Runtime"]
-        }
-        return deps
-    }
-}
-
-func getEnabledCXExperimentalFeatures() -> CXExperimentalFeatures {
-    let enabledFeatures = CXExperimentalFeatures.allCases.filter {
-        guard let flag = $0.flags.first, let value = env["CX_\(flag)"] else { return false }
-        return NSString(string: value).boolValue
-    }
-    return .init(enabledFeatures)
-}
-
-let enabledCXExperimentalFeatures = getEnabledCXExperimentalFeatures()
-enabledCXExperimentalFeatures.configure(package)
-
 // MARK: Combine Implementations
 enum CombineImplementation {
 
     case combine, combineX, openCombine
-    
-    func configure(_ package: Package) {
-        package.dependencies.append(contentsOf: self.extraPackageDependencies)
-        
-        guard let shimTarget = package.targets.first(where: { $0.name == "CXShim" }) else { return }
-        
-        shimTarget.dependencies = shimTargetDependencies
-        shimTarget.swiftSettings.append(contentsOf: shimTargetSwiftSettings)
-    }
-    
+
     var extraPackageDependencies: [Package.Dependency] {
         switch self {
         case .openCombine:  return [.package(url: "https://github.com/broadwaylamb/OpenCombine", .branch("master"))]
@@ -157,6 +81,22 @@ enum CombineImplementation {
     }
 }
 
+func configure(_ package: Package, with imp: CombineImplementation) {
+    package.dependencies.append(contentsOf: imp.extraPackageDependencies)
+    
+    guard let shimTarget = package.targets.first(where: { $0.name == "CXShim" }) else { return }
+    
+    shimTarget.dependencies = imp.shimTargetDependencies
+    shimTarget.swiftSettings.append(contentsOf: imp.shimTargetSwiftSettings)
+    
+    // Pass the swift settings of current combine implementation to all test targets.
+    package.targets
+        .filter { $0.isTest}
+        .forEach {
+            $0.swiftSettings.append(contentsOf: imp.shimTargetSwiftSettings)
+        }
+}
+
 func selectCombineImp() -> CombineImplementation {
     let key = "CX_COMBINE_IMPLEMENTATION"
     // CombineX -> combinex
@@ -176,15 +116,7 @@ func selectCombineImp() -> CombineImplementation {
 }
 
 let currentCombineImp = selectCombineImp()
-currentCombineImp.configure(package)
-
-// Pass the swift settings of current combine implementation and enabled experimental features to all test targets.
-let testSwiftSettings = currentCombineImp.shimTargetSwiftSettings + enabledCXExperimentalFeatures.extraSwiftSettings
-package.targets.forEach {
-    if $0.isTest {
-        $0.swiftSettings.append(contentsOf: testSwiftSettings)
-    }
-}
+configure(package, with: currentCombineImp)
 
 // Travis does not yet support macOS 10.15, so we have to generate an iOS project to test against `Combine`.
 if currentCombineImp == .combine && ProcessInfo.processInfo.environment["TRAVIS"] != nil {

Sources/CombineX/ObserableObject.swift

@@ -36,8 +36,6 @@ public protocol ObservableObject : AnyObject {
     var objectWillChange: Self.ObjectWillChangePublisher { get }
 }
 
-#if EXPERIMENTAL_OBSERVABLE_OBJECT
-
 import Runtime
 
 private protocol PublishedProtocol {
@@ -48,12 +46,8 @@ extension Published: PublishedProtocol {}
 private let publishedPropertiesCache = TypeInfoCache<UnsafeRawPointer, [PropertyInfo]>()
 private let globalObjectWillChangeCache = ObservableObjectPublisherCache<AnyObject, ObservableObjectPublisher>()
 
-#endif
-
 extension ObservableObject where Self.ObjectWillChangePublisher == ObservableObjectPublisher {
 
-    #if EXPERIMENTAL_OBSERVABLE_OBJECT
-    
     private static func publishedProperties() throws -> [PropertyInfo] {
         let key = unsafeBitCast(self, to: UnsafeRawPointer.self)
         return try publishedPropertiesCache.value(for: key) {
@@ -73,11 +67,8 @@ extension ObservableObject where Self.ObjectWillChangePublisher == ObservableObj
         }
     }
 
-    #endif
-    
     /// A publisher that emits before the object has changed.
     public var objectWillChange: ObservableObjectPublisher {
-        #if EXPERIMENTAL_OBSERVABLE_OBJECT
         return globalObjectWillChangeCache.value(for: self) {
             do {
                 let publishedProperties = try type(of: self).publishedProperties()
@@ -88,9 +79,6 @@ extension ObservableObject where Self.ObjectWillChangePublisher == ObservableObj
                 fatalError(error.localizedDescription)
             }
         }
-        #else
-        Global.RequiresImplementation()
-        #endif
     }
 }
 

Tests/CombineXTests/ObserableObjectSpec.swift

@@ -4,7 +4,7 @@ import Nimble
 
 class ObserableObjectSpec: QuickSpec {
 
-    #if swift(>=5.1) && (!USE_COMBINEX || EXPERIMENTAL_OBSERVABLE_OBJECT)
+    #if swift(>=5.1)
 
     typealias Published = CXShim.Published