From e8ff6cc7c2b960e46fa0bba096448a1e0b3e8063 Mon Sep 17 00:00:00 2001 From: xwenliang Date: Thu, 7 Dec 2017 18:29:23 +0800 Subject: [PATCH] unlink picker --- example/PickerTest/android/app/build.gradle | 1 - .../java/com/pickertest/MainApplication.java | 4 +--- example/PickerTest/android/settings.gradle | 2 -- .../ios/PickerTest.xcodeproj/project.pbxproj | 17 ----------------- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/example/PickerTest/android/app/build.gradle b/example/PickerTest/android/app/build.gradle index 7a64d08..208e0ee 100644 --- a/example/PickerTest/android/app/build.gradle +++ b/example/PickerTest/android/app/build.gradle @@ -137,7 +137,6 @@ android { } dependencies { - compile project(':react-native-picker') compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:appcompat-v7:23.0.1" compile "com.facebook.react:react-native:+" // From node_modules diff --git a/example/PickerTest/android/app/src/main/java/com/pickertest/MainApplication.java b/example/PickerTest/android/app/src/main/java/com/pickertest/MainApplication.java index a85e97d..028e1f3 100644 --- a/example/PickerTest/android/app/src/main/java/com/pickertest/MainApplication.java +++ b/example/PickerTest/android/app/src/main/java/com/pickertest/MainApplication.java @@ -3,7 +3,6 @@ package com.pickertest; import android.app.Application; import com.facebook.react.ReactApplication; -import com.beefe.picker.PickerViewPackage; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; @@ -23,8 +22,7 @@ public class MainApplication extends Application implements ReactApplication { @Override protected List getPackages() { return Arrays.asList( - new MainReactPackage(), - new PickerViewPackage() + new MainReactPackage() ); } diff --git a/example/PickerTest/android/settings.gradle b/example/PickerTest/android/settings.gradle index 9535d2a..554252a 100644 --- a/example/PickerTest/android/settings.gradle +++ b/example/PickerTest/android/settings.gradle @@ -1,5 +1,3 @@ rootProject.name = 'PickerTest' -include ':react-native-picker' -project(':react-native-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-picker/android') include ':app' diff --git a/example/PickerTest/ios/PickerTest.xcodeproj/project.pbxproj b/example/PickerTest/ios/PickerTest.xcodeproj/project.pbxproj index eec0008..5c2976b 100644 --- a/example/PickerTest/ios/PickerTest.xcodeproj/project.pbxproj +++ b/example/PickerTest/ios/PickerTest.xcodeproj/project.pbxproj @@ -36,7 +36,6 @@ 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; - 3874DA5F21CD465D9E5FA1B6 /* libRCTBEEPickerManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A19D256015574FD78B272EDA /* libRCTBEEPickerManager.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -264,8 +263,6 @@ 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; - 62084A3DA0E44393833AEE25 /* RCTBEEPickerManager.xcodeproj */ = {isa = PBXFileReference; name = "RCTBEEPickerManager.xcodeproj"; path = "../node_modules/react-native-picker/ios/RCTBEEPickerManager.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; - A19D256015574FD78B272EDA /* libRCTBEEPickerManager.a */ = {isa = PBXFileReference; name = "libRCTBEEPickerManager.a"; path = "libRCTBEEPickerManager.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -294,7 +291,6 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 3874DA5F21CD465D9E5FA1B6 /* libRCTBEEPickerManager.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -463,7 +459,6 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - 62084A3DA0E44393833AEE25 /* RCTBEEPickerManager.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -1011,11 +1006,9 @@ TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PickerTest.app/PickerTest"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-picker/ios/RCTBEEPickerManager", ); }; name = Debug; @@ -1036,11 +1029,9 @@ TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PickerTest.app/PickerTest"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-picker/ios/RCTBEEPickerManager", ); }; name = Release; @@ -1062,7 +1053,6 @@ VERSIONING_SYSTEM = "apple-generic"; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-picker/ios/RCTBEEPickerManager", ); }; name = Debug; @@ -1083,7 +1073,6 @@ VERSIONING_SYSTEM = "apple-generic"; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-picker/ios/RCTBEEPickerManager", ); }; name = Release; @@ -1113,11 +1102,9 @@ TVOS_DEPLOYMENT_TARGET = 9.2; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-picker/ios/RCTBEEPickerManager", ); }; name = Debug; @@ -1147,11 +1134,9 @@ TVOS_DEPLOYMENT_TARGET = 9.2; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-picker/ios/RCTBEEPickerManager", ); }; name = Release; @@ -1176,7 +1161,6 @@ TVOS_DEPLOYMENT_TARGET = 10.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); }; name = Debug; @@ -1201,7 +1185,6 @@ TVOS_DEPLOYMENT_TARGET = 10.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); }; name = Release; -- 2.26.2