@@ -610,80 +610,6 @@ const createPackageUWP = async () => {
610610 exec ( 'npm pack' , `${ assembledWindowsDir } ` ) ;
611611}
612612
613- const switchToBaseKit = async ( ) => {
614- assemblediOSAndroidDir = 'Assembled-BaseKit-iOSAndroid' ;
615- assembledWindowsDir = 'Assembled-BaseKit-Windows' ;
616- cmakeBasekitBuildDefinition = '-DBASEKIT_BUILD=1' ;
617- basekitBuild = true ;
618- basekitPackagePath = 'BaseKit/' ;
619- }
620-
621- const patchPackageVersion = async ( ) => {
622- const releaseVersionIndex = process . argv . indexOf ( '--releaseVersion' ) ;
623- const versionIndex = process . argv . indexOf ( '--reactNative' ) ;
624- if ( releaseVersionIndex != - 1 || versionIndex != - 1 ) {
625-
626- const packageJsonPath = '../Modules/@babylonjs/react-native/package.json' ;
627- const packageJsonPathWindows = '../Modules/@babylonjs/react-native/package.json' ;
628- const packageJsonPathiOSAndroid = '../Modules/@babylonjs/react-native-iosandroid/package.json' ;
629- const packageJson = JSON . parse ( fs . readFileSync ( packageJsonPath ) ) ;
630- const packageJsonWindows = JSON . parse ( fs . readFileSync ( packageJsonPathWindows ) ) ;
631- const packageJsoniOSAndroid = JSON . parse ( fs . readFileSync ( packageJsonPathiOSAndroid ) ) ;
632-
633- if ( versionIndex != - 1 ) {
634- const version = process . argv [ versionIndex + 1 ] ;
635- if ( version == '0.64' || version == '0.65' || version == '0.69' || version == '0.70' || version == '0.71' ) {
636- console . log ( chalk . black . bgCyan ( `Updating Package.json for React Native ${ version } .` ) ) ;
637-
638- // default 0.64
639- let peerDep = '>=0.63.1 <0.65.0' ;
640- let packageNamePostfix = '-0-64' ;
641- if ( version == '0.65' ) {
642- peerDep = '>=0.65.0 < 0.69.0' ;
643- packageNamePostfix = '-0-65' ;
644- } else if ( version == '0.69' ) {
645- peerDep = '>=0.69.0 < 0.70.0' ;
646- packageNamePostfix = '-0-69' ;
647- } else if ( version == '0.70' ) {
648- peerDep = '>=0.70.0 < 0.71.0' ;
649- packageNamePostfix = '-0-70' ;
650- } else if ( version == '0.71' ) {
651- peerDep = '>=0.71.0' ;
652- packageNamePostfix = '-0-71' ;
653- }
654-
655- if ( basekitBuild )
656- {
657- packageJsoniOSAndroid [ "name" ] = "@babylonjs/react-native-basekit-iosandroid" + packageNamePostfix ;
658- packageJsonWindows [ "name" ] = "@babylonjs/react-native-basekit-windows" + packageNamePostfix ;
659- delete packageJsoniOSAndroid [ 'peerDependencies' ] [ 'react-native-permissions' ] ;
660- delete packageJsonWindows [ 'peerDependencies' ] [ 'react-native-permissions' ] ;
661- } else {
662- packageJsoniOSAndroid [ "name" ] = "@babylonjs/react-native-iosandroid" + packageNamePostfix ;
663- packageJsonWindows [ "name" ] = "@babylonjs/react-native" + packageNamePostfix ;
664- }
665- packageJson . peerDependencies [ 'react-native' ] = peerDep ;
666- packageJsoniOSAndroid . peerDependencies [ 'react-native' ] = peerDep ;
667- packageJsonWindows . peerDependencies [ 'react-native' ] = peerDep ;
668- packageJsonWindows . peerDependencies [ 'react-native' ] = peerDep ;
669- }
670- }
671- // release version
672- if ( releaseVersionIndex !== - 1 ) {
673- const releaseVersion = process . argv [ releaseVersionIndex + 1 ] ;
674- console . log ( chalk . black . bgCyan ( `Updating Package.json for Release version ${ releaseVersion } .` ) ) ;
675- packageJsonWindows . peerDependencies [ "@babylonjs/react-native" ] = releaseVersion ;
676- packageJsoniOSAndroid . peerDependencies [ "@babylonjs/react-native" ] = releaseVersion ;
677- }
678-
679- fs . writeFileSync ( packageJsonPath , JSON . stringify ( packageJson , null , 2 ) ) ;
680- fs . writeFileSync ( packageJsonPathWindows , JSON . stringify ( packageJsonWindows , null , 2 ) ) ;
681- fs . writeFileSync ( packageJsonPathiOSAndroid , JSON . stringify ( packageJsoniOSAndroid , null , 2 ) ) ;
682- } else {
683- console . log ( chalk . black . bgCyan ( `No valid React Native version set. Letting Package.json unchanged.` ) )
684- }
685- }
686-
687613
688614//const COMMIT_ID = '7f82d72f22e9789b9b66cb837aec0c9bc8ff65ee';
689615//const ZIP_URL = `https://github.com/BabylonJS/BabylonNative/archive/${COMMIT_ID}.zip`;
@@ -826,9 +752,9 @@ const copyFiles = gulp.parallel(copyIOSAndroidCommonFiles, copyIOSFiles, copyAnd
826752
827753//const buildIOS = gulp.series(makeXCodeProj, buildIphoneOS, buildIphoneSimulator);
828754const buildIOS = gulp . series ( makeXCodeProj ) ; //, createXCFrameworks);
829- const buildTS = gulp . series ( patchPackageVersion , copyCommonFiles , copySharedFiles , buildTypeScript , validateAssembled ) ;
830- const buildIOSAndroid = gulp . series ( patchPackageVersion , buildIOS , buildAndroid , createIOSUniversalLibs , copyFiles , validateAssemblediOSAndroid ) ;
831- const build = gulp . series ( buildIOSAndroid , switchToBaseKit , buildIOSAndroid ) ;
755+ const buildTS = gulp . series ( copyCommonFiles , copySharedFiles , buildTypeScript , validateAssembled ) ;
756+ const buildIOSAndroid = gulp . series ( buildIOS , buildAndroid , createIOSUniversalLibs , copyFiles , validateAssemblediOSAndroid ) ;
757+ const build = gulp . series ( buildIOSAndroid , buildIOSAndroid ) ;
832758const rebuild = gulp . series ( clean , build ) ;
833759const pack = gulp . series ( rebuild , createPackage ) ;
834760
@@ -851,7 +777,7 @@ const packAndroid = gulp.series(clean, buildAndroid, copyFiles, createPackage, c
851777exports . packAndroid = packAndroid ;
852778
853779const copyPackageFilesUWP = gulp . series ( copyUWPFiles ) ;
854- const buildUWPPublish = gulp . series ( patchPackageVersion , buildUWP , copyPackageFilesUWP , switchToBaseKit , patchPackageVersion , buildUWP , copyPackageFilesUWP ) ;
780+ const buildUWPPublish = gulp . series ( buildUWP , copyPackageFilesUWP , buildUWP , copyPackageFilesUWP ) ;
855781const packUWP = gulp . series ( clean , buildUWP , copyPackageFilesUWP , createPackage , createPackageUWP ) ;
856782const packUWPNoBuild = gulp . series ( clean , copyPackageFilesUWP , createPackage , createPackageUWP ) ;
857783
0 commit comments