Skip to content

Commit

Permalink
[packages] Move unimodules foundation to org.unimodules scope
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjchmiela
sjchmiela authored Mar 14, 2019
1 parent bf882ac commit 8d441c7
Show file tree
Hide file tree
Showing 1,960 changed files with 53,997 additions and 51,371 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@ jobs:
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/expo
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/@unimodules/core
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/@unimodules/react-native-adapter
- yarn:
command: build
working_directory: ~/expo/packages/expo-barcode-scanner
Expand Down Expand Up @@ -240,9 +246,6 @@ jobs:
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/expo-analytics-amplitude
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/expo-errors
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/expo-face-detector
Expand Down Expand Up @@ -273,9 +276,6 @@ jobs:
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/expo-random
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/expo-react-native-adapter
- yarn:
command: test --maxWorkers 1
working_directory: ~/expo/packages/expo-secure-store
Expand Down
22 changes: 10 additions & 12 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/packages/@unimodules @sjchmiela
/packages/babel-preset-expo @brentvatne
/packages/expo-ads-admob @sjchmiela
/packages/expo-ads-facebook @Szymon20000
Expand All @@ -9,24 +10,22 @@
/packages/expo-av @sjchmiela
/packages/expo-background-fetch @tsapeta
/packages/expo-barcode-scanner @bbarthec
/packages/expo-barcode-scanner-interface @bbarthec
/packages/unimodules-barcode-scanner-interface @bbarthec
/packages/expo-blur @sjchmiela
/packages/expo-branch @esamelson
/packages/expo-brightness @sjchmiela
/packages/expo-calendar @tsapeta
/packages/expo-camera @bbarthec
/packages/expo-camera-interface @bbarthec
/packages/unimodules-camera-interface @bbarthec
/packages/expo-constants @tsapeta
/packages/expo-constants-interface @tsapeta
/packages/unimodules-constants-interface @tsapeta
/packages/expo-contacts @EvanBacon
/packages/expo-core @sjchmiela
/packages/expo-document-picker @bbarthec
/packages/expo-errors @esamelson
/packages/expo-face-detector @sjchmiela
/packages/expo-face-detector-interface @sjchmiela
/packages/unimodules-face-detector-interface @sjchmiela
/packages/expo-facebook @sjchmiela
/packages/expo-file-system @sjchmiela
/packages/expo-file-system-interface @sjchmiela
/packages/unimodules-file-system-interface @sjchmiela
/packages/expo-firebase-analytics @EvanBacon
/packages/expo-firebase-app @EvanBacon
/packages/expo-firebase-auth @EvanBacon
Expand All @@ -47,7 +46,7 @@
/packages/expo-gl @tsapeta
/packages/expo-gl-cpp @tsapeta
/packages/expo-google-sign-in @EvanBacon
/packages/expo-image-loader-interface @bbarthec
/packages/unimodules-image-loader-interface @bbarthec
/packages/expo-image-manipulator @bbarthec
/packages/expo-image-picker @bbarthec
/packages/expo-intent-launcher @tsapeta
Expand All @@ -62,18 +61,17 @@
/packages/expo-module-template @bbarthec
/packages/expo-payments-stripe @Szymon20000
/packages/expo-permissions @bbarthec
/packages/expo-permissions-interface @bbarthec
/packages/unimodules-permissions-interface @bbarthec
/packages/expo-print @tsapeta
/packages/expo-processing @EvanBacon
/packages/expo-react-native-adapter @sjchmiela
/packages/expo-secure-store @sjchmiela
/packages/expo-sensors @sjchmiela
/packages/expo-sensors-interface @sjchmiela
/packages/unimodules-sensors-interface @sjchmiela
/packages/expo-sms @bbarthec
/packages/expo-speech @Szymon20000
/packages/expo-sqlite @Szymon20000
/packages/expo-task-manager @tsapeta
/packages/expo-task-manager-interface @tsapeta
/packages/unimodules-task-manager-interface @tsapeta
/packages/expo-web-browser @sjchmiela
/packages/expo-yarn-workspaces @ide
/packages/jest-expo @brentvatne
Expand Down
16 changes: 8 additions & 8 deletions ExpoKit.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Pod::Spec.new do |s|
s.name = "ExpoKit"
s.version = "32.0.0"
s.version = "33.0.0"
s.summary = 'ExpoKit'
s.description = 'ExpoKit allows native projects to integrate with the Expo SDK.'
s.homepage = 'http://docs.expo.io'
Expand Down Expand Up @@ -38,13 +38,13 @@ Pod::Spec.new do |s|
ss.dependency 'React' # explicit dependency required for CocoaPods >= 1.5.0

# Universal modules required by ExpoKit so the code compiles
ss.dependency 'EXCore'
ss.dependency 'EXReactNativeAdapter'
ss.dependency 'EXSensorsInterface'
ss.dependency 'EXFileSystemInterface'
ss.dependency 'EXPermissionsInterface'
ss.dependency 'EXCameraInterface'
ss.dependency 'EXConstantsInterface'
ss.dependency 'UMCore'
ss.dependency 'UMReactNativeAdapter'
ss.dependency 'UMSensorsInterface'
ss.dependency 'UMFileSystemInterface'
ss.dependency 'UMPermissionsInterface'
ss.dependency 'UMCameraInterface'
ss.dependency 'UMConstantsInterface'
end

s.subspec "Payments" do |ss|
Expand Down
23 changes: 11 additions & 12 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,20 +229,19 @@ dependencies {
/* UNCOMMENT WHEN DISTRIBUTING
api 'com.facebook.react:react-native:32.0.0'
api 'host.exp.exponent:expo-app-loader-provider:3.0.0'
api 'host.exp.exponent:expo-core:3.0.1'
api 'host.exp.exponent:expo-constants-interface:3.0.0'
api 'org.unimodules:unimodules-core:1.0.0'
api 'org.unimodules:unimodules-constants-interface:1.0.0'
api 'host.exp.exponent:expo-constants:3.0.0'
api 'host.exp.exponent:expo-document-picker:3.0.0'
api 'host.exp.exponent:expo-errors:3.0.0'
api 'host.exp.exponent:expo-file-system-interface:3.0.1'
api 'org.unimodules:unimodules-file-system-interface:1.0.0'
api 'host.exp.exponent:expo-file-system:3.0.1'
api 'host.exp.exponent:expo-image-loader-interface:3.0.0'
api 'org.unimodules:unimodules-image-loader-interface:1.0.0'
api 'host.exp.exponent:expo-permissions:3.0.0'
api 'host.exp.exponent:expo-permissions-interface:3.0.0'
api 'host.exp.exponent:expo-sensors-interface:3.0.0'
api 'host.exp.exponent:expo-react-native-adapter:3.0.1'
api 'org.unimodules:unimodules-permissions-interface:1.0.0'
api 'org.unimodules:unimodules-sensors-interface:1.0.0'
api 'org.unimodules:unimodules-react-native-adapter:1.0.0'
api 'host.exp.exponent:expo-task-manager:3.0.0'
api 'host.exp.exponent:expo-task-manager-interface:3.0.0'
api 'org.unimodules:unimodules-task-manager-interface:1.0.0'
// Optional universal modules, could be removed
// along with references in MainActivity
Expand All @@ -252,16 +251,16 @@ dependencies {
api 'host.exp.exponent:expo-app-auth:3.0.0'
api 'host.exp.exponent:expo-av:3.0.0'
api 'host.exp.exponent:expo-analytics-segment:3.0.0'
api 'host.exp.exponent:expo-barcode-scanner-interface:3.0.0'
api 'org.unimodules:unimodules-barcode-scanner-interface:1.0.0'
api 'host.exp.exponent:expo-barcode-scanner:3.0.0'
api 'host.exp.exponent:expo-brightness:3.0.0'
api 'host.exp.exponent:expo-calendar:3.0.0'
api 'host.exp.exponent:expo-camera-interface:3.0.0'
api 'org.unimodules:unimodules-camera-interface:1.0.0'
api 'host.exp.exponent:expo-camera:3.0.0'
api 'host.exp.exponent:expo-contacts:3.0.0'
api 'host.exp.exponent:expo-facebook:3.0.0'
api 'host.exp.exponent:expo-face-detector:3.0.0'
api 'host.exp.exponent:expo-face-detector-interface:3.0.0'
api 'org.unimodules:unimodules-face-detector-interface:1.0.0'
api 'host.exp.exponent:expo-font:3.0.1'
api 'host.exp.exponent:expo-gl-cpp:3.0.0'
api 'host.exp.exponent:expo-gl:3.0.1'
Expand Down
4 changes: 2 additions & 2 deletions android/app/proguard-rules.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
##### Expo Universal Modules #####

-keepclassmembers class * {
@expo.core.interfaces.ExpoProp *;
@org.unimodules.core.interfaces.ExpoProp *;
}
-keepclassmembers class * {
@expo.core.interfaces.ExpoMethod *;
@org.unimodules.core.interfaces.ExpoMethod *;
}

-keepclassmembers class * {
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/assets/kernel.android.bundle
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion android/app/src/main/java/host/exp/exponent/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import java.util.List;

import expo.core.interfaces.Package;
import org.unimodules.core.interfaces.Package;
import host.exp.exponent.generated.DetachBuildConstants;
import host.exp.exponent.experience.DetachActivity;

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/host/exp/exponent/MainApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.Arrays;
import java.util.List;

import expo.core.interfaces.Package;
import org.unimodules.core.interfaces.Package;
import expo.loaders.provider.interfaces.AppLoaderPackagesProviderInterface;
import expo.modules.ads.admob.AdMobPackage;
import expo.modules.ads.facebook.AdsFacebookPackage;
Expand Down
65 changes: 33 additions & 32 deletions android/expoview/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ configurations.all {
}

// WHEN_DISTRIBUTING_REMOVE_FROM_HERE
// WHEN_VERSIONING_REMOVE_FROM_HERE
// Import gradle helpers for unimodules.
apply from: "../../node_modules/react-native-unimodules/gradle.groovy"
// WHEN_VERSIONING_REMOVE_TO_HERE
// WHEN_DISTRIBUTING_REMOVE_TO_HERE

dependencies {
Expand All @@ -125,20 +127,19 @@ dependencies {
/* UNCOMMENT WHEN DISTRIBUTING
api 'com.facebook.react:react-native:32.0.0'
api 'host.exp.exponent:expo-app-loader-provider:3.0.0'
api 'host.exp.exponent:expo-core:3.0.1'
api 'org.unimodules:unimodules-core:1.0.0'
api 'host.exp.exponent:expo-constants:3.0.0'
api 'host.exp.exponent:expo-constants-interface:3.0.0'
api 'org.unimodules:unimodules-constants-interface:1.0.0'
api 'host.exp.exponent:expo-document-picker:3.0.0'
api 'host.exp.exponent:expo-errors:3.0.0'
api 'host.exp.exponent:expo-file-system:3.0.1'
api 'host.exp.exponent:expo-file-system-interface:3.0.0'
api 'org.unimodules:unimodules-file-system-interface:1.0.0'
api 'host.exp.exponent:expo-permissions:3.0.0'
api 'host.exp.exponent:expo-permissions-interface:3.0.0'
api 'host.exp.exponent:expo-react-native-adapter:3.0.1'
api 'org.unimodules:unimodules-permissions-interface:1.0.0'
api 'org.unimodules:unimodules-react-native-adapter:1.0.0'
api 'host.exp.exponent:expo-secure-store:3.0.0'
api 'host.exp.exponent:expo-sensors-interface:3.0.0'
api 'org.unimodules:unimodules-sensors-interface:1.0.0'
api 'host.exp.exponent:expo-task-manager:3.0.0'
api 'host.exp.exponent:expo-task-manager-interface:3.0.0'
api 'org.unimodules:unimodules-task-manager-interface:1.0.0'
// Optional universal modules
compileOnly 'host.exp.exponent:expo-ads-admob:3.0.0'
Expand All @@ -149,11 +150,11 @@ dependencies {
compileOnly 'host.exp.exponent:expo-av:3.0.0'
compileOnly 'host.exp.exponent:expo-background-fetch:3.0.0'
compileOnly 'host.exp.exponent:expo-barcode-scanner:3.0.0'
compileOnly 'host.exp.exponent:expo-barcode-scanner-interface:3.0.0'
compileOnly 'org.unimodules:unimodules-barcode-scanner-interface:1.0.0'
compileOnly 'host.exp.exponent:expo-brightness:3.0.0'
compileOnly 'host.exp.exponent:expo-calendar:3.0.0'
compileOnly 'host.exp.exponent:expo-camera:3.0.0'
compileOnly 'host.exp.exponent:expo-camera-interface:3.0.0'
compileOnly 'org.unimodules:unimodules-camera-interface:1.0.0'
compileOnly 'host.exp.exponent:expo-contacts:3.0.0'
compileOnly 'host.exp.exponent:expo-crypto:3.0.0'
compileOnly 'host.exp.exponent:expo-face-detector:3.0.0'
Expand All @@ -163,7 +164,7 @@ dependencies {
compileOnly 'host.exp.exponent:expo-gl-cpp:3.0.0'
compileOnly 'host.exp.exponent:expo-google-sign-in:3.0.0'
compileOnly 'host.exp.exponent:expo-haptics:3.0.0'
compileOnly 'host.exp.exponent:expo-image-loader-interface:3.0.0'
compileOnly 'org.unimodules:unimodules-image-loader-interface:1.0.0'
compileOnly 'host.exp.exponent:expo-image-manipulator:3.0.0'
compileOnly 'host.exp.exponent:expo-image-picker:3.0.0'
compileOnly 'host.exp.exponent:expo-intent-launcher:3.0.0'
Expand Down Expand Up @@ -192,27 +193,27 @@ dependencies {
// They're defined as "api" so we don't have to define them again in app/build.gradle
// In distribution they're "compileOnly" and it's the app/build.gradle who manages them.
useUnimodules([
modulesPaths: ['../../packages'],
configuration: 'api',
target: 'react-native',
exclude: [
'expo-firebase-analytics',
'expo-firebase-app',
'expo-firebase-auth',
'expo-firebase-crashlytics',
'expo-firebase-database',
'expo-firebase-firestore',
'expo-firebase-functions',
'expo-firebase-instance-id',
'expo-firebase-invites',
'expo-firebase-links',
'expo-firebase-messaging',
'expo-firebase-notifications',
'expo-firebase-performance',
'expo-firebase-remote-config',
'expo-firebase-storage',
'expo-module-template',
]
modulesPaths : ['../../packages'],
configuration: 'api',
target : 'react-native',
exclude : [
'expo-firebase-analytics',
'expo-firebase-app',
'expo-firebase-auth',
'expo-firebase-crashlytics',
'expo-firebase-database',
'expo-firebase-firestore',
'expo-firebase-functions',
'expo-firebase-instance-id',
'expo-firebase-invites',
'expo-firebase-links',
'expo-firebase-messaging',
'expo-firebase-notifications',
'expo-firebase-performance',
'expo-firebase-remote-config',
'expo-firebase-storage',
'expo-module-template',
]
])

// Versioned react native
Expand Down
4 changes: 2 additions & 2 deletions android/expoview/proguard-rules.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
##### Expo Universal Modules #####

-keepclassmembers class * {
@expo.core.interfaces.ExpoProp *;
@org.unimodules.core.interfaces.ExpoProp *;
}
-keepclassmembers class * {
@expo.core.interfaces.ExpoMethod *;
@org.unimodules.core.interfaces.ExpoMethod *;
}

-keepclassmembers class * {
Expand Down
6 changes: 3 additions & 3 deletions android/expoview/src/main/java/host/exp/exponent/experience/DetachActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import java.util.List;

import expo.adapters.react.ReactModuleRegistryProvider;
import expo.core.interfaces.Package;
import expo.core.interfaces.SingletonModule;
import org.unimodules.adapters.react.ReactModuleRegistryProvider;
import org.unimodules.core.interfaces.Package;
import org.unimodules.core.interfaces.SingletonModule;
import host.exp.exponent.Constants;
import host.exp.expoview.ExpoViewBuildConfig;
import versioned.host.exp.exponent.ExponentPackageDelegate;
Expand Down
8 changes: 4 additions & 4 deletions ...id/expoview/src/main/java/host/exp/exponent/experience/DetachedModuleRegistryAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import java.util.List;
import java.util.Map;

import expo.adapters.react.ReactModuleRegistryProvider;
import expo.core.ModuleRegistry;
import expo.core.interfaces.InternalModule;
import expo.core.interfaces.ModuleRegistryConsumer;
import org.unimodules.adapters.react.ReactModuleRegistryProvider;
import org.unimodules.core.ModuleRegistry;
import org.unimodules.core.interfaces.InternalModule;
import org.unimodules.core.interfaces.ModuleRegistryConsumer;
import host.exp.exponent.ExponentManifest;
import host.exp.exponent.kernel.ExperienceId;
import host.exp.exponent.utils.ScopedContext;
Expand Down
2 changes: 1 addition & 1 deletion android/expoview/src/main/java/host/exp/exponent/experience/ExperienceActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import javax.inject.Inject;

import de.greenrobot.event.EventBus;
import expo.core.interfaces.Package;
import org.unimodules.core.interfaces.Package;
import host.exp.exponent.ABIVersion;
import host.exp.exponent.AppLoader;
import host.exp.exponent.Constants;
Expand Down
2 changes: 1 addition & 1 deletion android/expoview/src/main/java/host/exp/exponent/experience/HomeActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.List;

import de.greenrobot.event.EventBus;
import expo.core.interfaces.Package;
import org.unimodules.core.interfaces.Package;
import expo.modules.analytics.amplitude.AmplitudePackage;
import expo.modules.barcodescanner.BarCodeScannerPackage;
import expo.modules.constants.ConstantsPackage;
Expand Down
2 changes: 1 addition & 1 deletion android/expoview/src/main/java/host/exp/exponent/experience/ReactNativeActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import javax.inject.Inject;

import de.greenrobot.event.EventBus;
import expo.core.interfaces.Package;
import org.unimodules.core.interfaces.Package;
import host.exp.exponent.ABIVersion;
import host.exp.exponent.Constants;
import host.exp.exponent.ExponentManifest;
Expand Down
2 changes: 1 addition & 1 deletion android/expoview/src/main/java/host/exp/exponent/headless/HeadlessAppLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.List;
import java.util.Map;

import expo.core.interfaces.Package;
import org.unimodules.core.interfaces.Package;
import expo.loaders.provider.AppLoaderProvider;
import expo.loaders.provider.interfaces.AppLoaderInterface;
import expo.loaders.provider.interfaces.AppLoaderPackagesProviderInterface;
Expand Down
Loading

0 comments on commit 8d441c7

Please sign in to comment.