cleanup

airbnb · Dec 13, 2018 · 6686f4a · 6686f4a
1 parent f8b2532
commit 6686f4a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/App/BUCK b/App/BUCK
@@ -23,15 +23,15 @@ apple_binary(
         "main.m",
     ]),
     deps = [
-        "//Libraries/SwiftLibrary01:SwiftLibrary01",
+        "//Libraries/Swift1:Swift1",
         ":ExampleAppResource",
         ":ExampleAppAssets",
     ],
 )
 
 xcode_workspace_config(
     name = "lib_workspace",
-    src_target = "//Libraries/SwiftLibrary01:SwiftLibrary01",
+    src_target = "//Libraries/Swift1:Swift1",
 )
 
 xcode_workspace_config(

diff --git a/App/Tests/BUCK b/App/Tests/BUCK
@@ -8,6 +8,6 @@ apple_test_lib(
     ]),
     info_plist = "Info.plist",
     deps = [
-        "//Libraries/SwiftLibrary01:SwiftLibrary01",
+        "//Libraries/Swift1:Swift1",
     ],
 )
diff --git a/App/Tests/BuckSampleTests.swift b/App/Tests/BuckSampleTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SwiftLibrary01
+@testable import Swift1
 
 class BuckSampleTests: XCTestCase {
 

diff --git a/App/UITests/BUCK b/App/UITests/BUCK
@@ -10,6 +10,6 @@ apple_test_lib(
     info_plist = "Info.plist",
     labels = ['ui'],
     deps = [
-        "//Libraries/SwiftLibrary01:SwiftLibrary01",
+        "//Libraries/Swift1:Swift1",
     ],
 )
diff --git a/Libraries/SwiftLibrary01/AppDelegate.swift → Libraries/Swift1/AppDelegate.swift b/Libraries/SwiftLibrary01/AppDelegate.swift → Libraries/Swift1/AppDelegate.swift
diff --git a/Libraries/SwiftLibrary01/BUCK → Libraries/Swift1/BUCK b/Libraries/SwiftLibrary01/BUCK → Libraries/Swift1/BUCK
@@ -1,10 +1,9 @@
 load("//Config:buck_rule_macros.bzl", "apple_lib")
 
 apple_lib(
-    name = "SwiftLibrary01",
+    name = "Swift1",
     visibility = ["PUBLIC"],
     modular = True,
-    swift_version = "4.2",
     srcs = glob([
         "**/*.swift",
     ]),
@@ -18,4 +17,7 @@ apple_lib(
     tests = [
         "//App/Tests:Tests",
     ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
 )
diff --git a/...aries/SwiftLibrary01/ViewController.swift → Libraries/Swift1/ViewController.swift b/...aries/SwiftLibrary01/ViewController.swift → Libraries/Swift1/ViewController.swift
@@ -42,14 +42,14 @@ class ViewController: UIViewController {
     // Objective C class defined in Objc1
     // When this is uncommented, LLDB fails to print objects properly
     // with the following error:
-    //   failed to get module 'SwiftLibrary01' from AST context:
+    //   failed to get module 'Swift1' from AST context:
     //   error: missing required module 'Objc1'
 //    let o = Objc1()
 //    print("Objc1: %s", o)
 
     // Swift class defined in SwiftAndObjc
     // When this is used, the compile fails with
     //    #import <SwiftAndObjc/SwiftAndObjc-Swift.h> file not found
-    // print("SwiftAndObjc \(Swift3())")
+//     print("SwiftAndObjc \(Swift3())")
   }
 }
diff --git a/Libraries/Swift2/BUCK b/Libraries/Swift2/BUCK
@@ -5,7 +5,7 @@ apple_lib(
     visibility = ["PUBLIC"],
     modular = True,
     srcs = glob([
-        "SwiftClass2.swift",
+        "**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",