Commit ae51849a authored by yogevbd's avatar yogevbd

Move android and ios folders into lib folder

parent d3ad6d0d
...@@ -15,8 +15,11 @@ npm-debug.log ...@@ -15,8 +15,11 @@ npm-debug.log
##### #####
# Android # Android
android/local.properties lib/android/local.properties
android/*.iml lib/android/*.iml
lib/android/.idea
lib/android/build
lib/android/.gradle
##### #####
# OS X temporary files that should never be committed # OS X temporary files that should never be committed
...@@ -187,10 +190,6 @@ coverage/ ...@@ -187,10 +190,6 @@ coverage/
package-lock.json package-lock.json
.history .history
android/.idea
android/build
# Typescript build # Typescript build
lib/dist/ lib/dist/
android/.gradle
\ No newline at end of file
...@@ -54,7 +54,7 @@ Add a reference to the library's native code in your global `settings.gradle`: ...@@ -54,7 +54,7 @@ Add a reference to the library's native code in your global `settings.gradle`:
```gradle ```gradle
include ':reactnativenotifications' include ':reactnativenotifications'
project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android/app') project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/lib/android/app')
``` ```
Declare the library as a dependency in your **app-project's** `build.gradle`: Declare the library as a dependency in your **app-project's** `build.gradle`:
......
include ':myapplication' include ':myapplication'
include ':react-native-notifications' include ':react-native-notifications'
project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../../android/app') project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../../lib/android/app')
\ No newline at end of file \ No newline at end of file
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
D84861172267695100E9103D /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; D84861172267695100E9103D /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNNotifications.xcodeproj; path = ../../RNNotifications/RNNotifications.xcodeproj; sourceTree = "<group>"; }; D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNNotifications.xcodeproj; path = ../../lib/ios/RNNotifications.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -936,7 +936,7 @@ ...@@ -936,7 +936,7 @@
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../node_modules/react-native/React/**", "$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**", "$(SRCROOT)/../node_modules/react-native-notifications/lib/ios/**",
); );
INFOPLIST_FILE = NotificationsExampleApp/Info.plist; INFOPLIST_FILE = NotificationsExampleApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 10.0;
...@@ -961,7 +961,7 @@ ...@@ -961,7 +961,7 @@
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../node_modules/react-native/React/**", "$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**", "$(SRCROOT)/../node_modules/react-native-notifications/lib/ios/**",
); );
INFOPLIST_FILE = NotificationsExampleApp/Info.plist; INFOPLIST_FILE = NotificationsExampleApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 10.0;
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
BlueprintIdentifier = "508CE7C722D12B2600357815" BlueprintIdentifier = "508CE7C722D12B2600357815"
BuildableName = "RNNotificationsTests.xctest" BuildableName = "RNNotificationsTests.xctest"
BlueprintName = "RNNotificationsTests" BlueprintName = "RNNotificationsTests"
ReferencedContainer = "container:../../RNNotifications/RNNotifications.xcodeproj"> ReferencedContainer = "container:../../lib/ios/RNNotifications.xcodeproj">
</BuildableReference> </BuildableReference>
</CodeCoverageTargets> </CodeCoverageTargets>
<Testables> <Testables>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
BlueprintIdentifier = "508CE7C722D12B2600357815" BlueprintIdentifier = "508CE7C722D12B2600357815"
BuildableName = "RNNotificationsTests.xctest" BuildableName = "RNNotificationsTests.xctest"
BlueprintName = "RNNotificationsTests" BlueprintName = "RNNotificationsTests"
ReferencedContainer = "container:../../RNNotifications/RNNotifications.xcodeproj"> ReferencedContainer = "container:../../lib/ios/RNNotifications.xcodeproj">
</BuildableReference> </BuildableReference>
</TestableReference> </TestableReference>
</Testables> </Testables>
......
...@@ -23,7 +23,7 @@ allprojects { ...@@ -23,7 +23,7 @@ allprojects {
jcenter() jcenter()
maven { maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android" url "$rootDir/../../node_modules/react-native/android"
} }
} }
} }
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment