diff --git a/Split.podspec b/RNSplit.podspec similarity index 90% rename from Split.podspec rename to RNSplit.podspec index ad1948c..2024ced 100644 --- a/Split.podspec +++ b/RNSplit.podspec @@ -3,8 +3,8 @@ require "json" package = JSON.parse(File.read(File.join(__dir__, "package.json"))) Pod::Spec.new do |s| - s.name = "Split" - s.module_name = "Split" + s.name = "RNSplit" + s.module_name = "RNSplit" s.summary = package["description"] s.version = package["version"] s.author = package["author"] diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 9585048..e7854c8 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="io.split.rnsplit"> \ No newline at end of file diff --git a/android/src/main/java/com/github/jonnybgod/RNEventSource/RNEventSourceModule.java b/android/src/main/java/io/split/rnsplit/RNEventSourceModule.java similarity index 99% rename from android/src/main/java/com/github/jonnybgod/RNEventSource/RNEventSourceModule.java rename to android/src/main/java/io/split/rnsplit/RNEventSourceModule.java index b5c82ae..6985585 100644 --- a/android/src/main/java/com/github/jonnybgod/RNEventSource/RNEventSourceModule.java +++ b/android/src/main/java/io/split/rnsplit/RNEventSourceModule.java @@ -1,4 +1,4 @@ -package com.github.jonnybgod.RNEventSource; +package io.split.rnsplit; import java.io.IOException; diff --git a/android/src/main/java/com/github/jonnybgod/RNEventSource/RNEventSourcePackage.java b/android/src/main/java/io/split/rnsplit/RNSplitPackage.java similarity index 85% rename from android/src/main/java/com/github/jonnybgod/RNEventSource/RNEventSourcePackage.java rename to android/src/main/java/io/split/rnsplit/RNSplitPackage.java index 67bc65c..ae7c59c 100644 --- a/android/src/main/java/com/github/jonnybgod/RNEventSource/RNEventSourcePackage.java +++ b/android/src/main/java/io/split/rnsplit/RNSplitPackage.java @@ -1,4 +1,4 @@ -package com.github.jonnybgod.RNEventSource; +package io.split.rnsplit; import java.util.Arrays; import java.util.ArrayList; @@ -11,9 +11,9 @@ import com.facebook.react.uimanager.ViewManager; import com.facebook.react.bridge.JavaScriptModule; -public class RNEventSourcePackage implements ReactPackage { +public class RNSplitPackage implements ReactPackage { - public RNEventSourcePackage() {} + public RNSplitPackage() {} @Override public List createNativeModules( diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java index efccbad..9bd282d 100644 --- a/example/android/app/src/main/java/com/example/MainApplication.java +++ b/example/android/app/src/main/java/com/example/MainApplication.java @@ -10,7 +10,7 @@ import com.facebook.soloader.SoLoader; import java.lang.reflect.InvocationTargetException; import java.util.List; -import com.github.jonnybgod.RNEventSource.RNEventSourcePackage; +import io.split.rnsplit.RNSplitPackage; public class MainApplication extends Application implements ReactApplication { @@ -27,7 +27,7 @@ protected List getPackages() { List packages = new PackageList(this).getPackages(); // Packages that cannot be autolinked yet can be added manually here, for example: // packages.add(new MyReactNativePackage()); - packages.add(new RNEventSourcePackage()); + packages.add(new RNSplitPackage()); return packages; } diff --git a/example/ios/Podfile b/example/ios/Podfile index 969144f..86851a1 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -17,7 +17,7 @@ target 'example' do # Pods for testing end - pod 'Split', :path => '../..' + pod 'RNSplit', :path => '../..' # Enables Flipper. # diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index c1dff41..d9028bd 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -316,7 +316,7 @@ PODS: - React-cxxreact (= 0.64.1) - React-jsi (= 0.64.1) - React-perflogger (= 0.64.1) - - Split (0.0.1-canary.0): + - RNSplit (0.0.1-canary.2): - React - Yoga (1.14.0) - YogaKit (1.18.1): @@ -371,7 +371,7 @@ DEPENDENCIES: - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - Split (from `../..`) + - RNSplit (from `../..`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: @@ -444,7 +444,7 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" ReactCommon: :path: "../node_modules/react-native/ReactCommon" - Split: + RNSplit: :path: "../.." Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" @@ -488,10 +488,10 @@ SPEC CHECKSUMS: React-RCTVibration: 4b99a7f5c6c0abbc5256410cc5425fb8531986e1 React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6 ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca - Split: 6b78070ca2ea993834673ba98be3304efa5cfdee + RNSplit: 428e2a7c18fd621ec3494d0e39b31bab158104d9 Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: b0666e27b6e3a8b7e47f93e272b1116fcf0a20e3 +PODFILE CHECKSUM: 446a3cfd56a34c58128e1c92cebd53fb2ce3971a COCOAPODS: 1.10.1 diff --git a/ios/RNEventSource.xcodeproj/project.pbxproj b/ios/RNEventSource.xcodeproj/project.pbxproj index bae23fa..51b7bac 100644 --- a/ios/RNEventSource.xcodeproj/project.pbxproj +++ b/ios/RNEventSource.xcodeproj/project.pbxproj @@ -11,19 +11,8 @@ 55C5EF221EA2A263005345B7 /* TRVSServerSentEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C5EF201EA2A263005345B7 /* TRVSServerSentEvent.m */; }; 911488971B28A9A700A81437 /* RNEventSource.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 911488961B28A9A700A81437 /* RNEventSource.h */; }; 911488991B28A9A700A81437 /* RNEventSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 911488981B28A9A700A81437 /* RNEventSource.m */; }; - 9114889F1B28A9A700A81437 /* libRNEventSource.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 911488931B28A9A700A81437 /* libRNEventSource.a */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 911488A01B28A9A700A81437 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9114888B1B28A9A700A81437 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 911488921B28A9A700A81437; - remoteInfo = RNEventSource; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 911488911B28A9A700A81437 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -46,8 +35,6 @@ 911488931B28A9A700A81437 /* libRNEventSource.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNEventSource.a; sourceTree = BUILT_PRODUCTS_DIR; }; 911488961B28A9A700A81437 /* RNEventSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNEventSource.h; sourceTree = ""; }; 911488981B28A9A700A81437 /* RNEventSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNEventSource.m; sourceTree = ""; }; - 9114889E1B28A9A700A81437 /* RNEventSourceTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNEventSourceTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 911488A31B28A9A700A81437 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -58,14 +45,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9114889B1B28A9A700A81437 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9114889F1B28A9A700A81437 /* libRNEventSource.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -85,7 +64,6 @@ isa = PBXGroup; children = ( 911488951B28A9A700A81437 /* RNEventSource */, - 911488A21B28A9A700A81437 /* RNEventSourceTests */, 911488941B28A9A700A81437 /* Products */, ); sourceTree = ""; @@ -94,7 +72,6 @@ isa = PBXGroup; children = ( 911488931B28A9A700A81437 /* libRNEventSource.a */, - 9114889E1B28A9A700A81437 /* RNEventSourceTests.xctest */, ); name = Products; sourceTree = ""; @@ -109,14 +86,6 @@ path = RNEventSource; sourceTree = ""; }; - 911488A21B28A9A700A81437 /* RNEventSourceTests */ = { - isa = PBXGroup; - children = ( - 911488A31B28A9A700A81437 /* Info.plist */, - ); - path = RNEventSourceTests; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -137,24 +106,6 @@ productReference = 911488931B28A9A700A81437 /* libRNEventSource.a */; productType = "com.apple.product-type.library.static"; }; - 9114889D1B28A9A700A81437 /* RNEventSourceTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 911488A91B28A9A700A81437 /* Build configuration list for PBXNativeTarget "RNEventSourceTests" */; - buildPhases = ( - 9114889A1B28A9A700A81437 /* Sources */, - 9114889B1B28A9A700A81437 /* Frameworks */, - 9114889C1B28A9A700A81437 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 911488A11B28A9A700A81437 /* PBXTargetDependency */, - ); - name = RNEventSourceTests; - productName = RNEventSourceTests; - productReference = 9114889E1B28A9A700A81437 /* RNEventSourceTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -167,9 +118,6 @@ 911488921B28A9A700A81437 = { CreatedOnToolsVersion = 7.0; }; - 9114889D1B28A9A700A81437 = { - CreatedOnToolsVersion = 7.0; - }; }; }; buildConfigurationList = 9114888E1B28A9A700A81437 /* Build configuration list for PBXProject "RNEventSource" */; @@ -177,6 +125,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 9114888A1B28A9A700A81437; @@ -185,21 +134,10 @@ projectRoot = ""; targets = ( 911488921B28A9A700A81437 /* RNEventSource */, - 9114889D1B28A9A700A81437 /* RNEventSourceTests */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 9114889C1B28A9A700A81437 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 9114888F1B28A9A700A81437 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -211,23 +149,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9114889A1B28A9A700A81437 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 911488A11B28A9A700A81437 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 911488921B28A9A700A81437 /* RNEventSource */; - targetProxy = 911488A01B28A9A700A81437 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 911488A41B28A9A700A81437 /* Debug */ = { isa = XCBuildConfiguration; @@ -333,28 +256,6 @@ }; name = Release; }; - 911488AA1B28A9A700A81437 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - INFOPLIST_FILE = RNEventSourceTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = pw.RNEventSourceTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 911488AB1B28A9A700A81437 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - INFOPLIST_FILE = RNEventSourceTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = pw.RNEventSourceTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -376,15 +277,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 911488A91B28A9A700A81437 /* Build configuration list for PBXNativeTarget "RNEventSourceTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 911488AA1B28A9A700A81437 /* Debug */, - 911488AB1B28A9A700A81437 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 9114888B1B28A9A700A81437 /* Project object */; diff --git a/package-lock.json b/package-lock.json index 21cde0b..754f090 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio-react-native", - "version": "0.0.1-canary.0", + "version": "0.0.1-canary.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5485d36..5aba7e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio-react-native", - "version": "0.0.1-canary.0", + "version": "0.0.1-canary.2", "description": "Split SDK for React Native", "main": "lib/commonjs/index", "module": "lib/module/index", @@ -17,7 +17,7 @@ "types", "android", "ios", - "Split.podspec", + "RNSplit.podspec", "!android/build", "!ios/build", "!**/__tests__", diff --git a/src/settings/defaults.ts b/src/settings/defaults.ts index 72daf4b..5c662ee 100644 --- a/src/settings/defaults.ts +++ b/src/settings/defaults.ts @@ -1,4 +1,4 @@ -const packageVersion = '0.0.1-canary.0'; +const packageVersion = '0.0.1-canary.2'; export const defaults = { startup: {