Feature/prepare publish (#2)

* add doric-js bundle into vcs

* android project read js bundle directly

* update iOS project config

* update version

DoricCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'DoricCore'
-  s.version          = '0.1.2'
+  s.version          = '0.2.0'
   s.summary          = 'Doric iOS SDK'
 
 
@@ -17,7 +17,7 @@ Doric iOS SDK for cross platform develpment
 
   s.source_files = 'doric-iOS/Pod/Classes/**/*'
   s.resource_bundles = {
-    'Doric' => ['doric-iOS/Pod/Assets/**/*']
+    'Doric' => ['doric-js/bundle/**/*']
   }
 
   s.public_header_files = 'doric-iOS/Pod/Classes/**/*.h'

bundle.sh

@@ -7,20 +7,3 @@
 CURRENT_DIR=$(cd $(dirname $0); pwd)
 
 cd $CURRENT_DIR/doric-js && npm run build
-
-rm -rf $CURRENT_DIR/doric-Android/doric/src/main/assets/bundle/*.js
-cp -rf $CURRENT_DIR/doric-js/bundle/*.js $CURRENT_DIR/doric-Android/doric/src/main/assets/bundle
-
-rm -rf $CURRENT_DIR/doric-iOS/Pod/Assets/bundle/*.js
-cp -rf $CURRENT_DIR/doric-js/bundle/*.js $CURRENT_DIR/doric-iOS/Pod/Assets/bundle
-
-rm -rf $CURRENT_DIR/doric-iOS-framework/Assets/bundle/*.js
-cp -rf $CURRENT_DIR/doric-js/bundle/*.js $CURRENT_DIR/doric-iOS-framework/Assets/bundle
-
-cd $CURRENT_DIR/doric-demo && npm run build
-
-rm -rf $CURRENT_DIR/doric-Android/app/src/main/assets/demo/*.js
-cp -rf $CURRENT_DIR/doric-demo/bundle/src/*.js $CURRENT_DIR/doric-Android/app/src/main/assets/demo
-
-rm -rf $CURRENT_DIR/doric-iOS/Example/Example/demo/*.js
-cp -rf $CURRENT_DIR/doric-demo/bundle/src/*.js $CURRENT_DIR/doric-iOS/Example/Example/demo

doric-android/app/build.gradle

@@ -17,6 +17,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    sourceSets {
+        main {
+            assets.srcDirs = [project.getRootDir().getParent() + "/doric-demo/bundle"]
+        }
+    }
 }
 
 dependencies {

doric-android/app/src/main/assets/demo/.gitignore

@@ -1 +0,0 @@
-*.js

doric-android/app/src/main/java/pub/doric/demo/MainActivity.java

@@ -60,7 +60,7 @@ public class MainActivity extends AppCompatActivity {
         recyclerView.setBackgroundColor(Color.WHITE);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         try {
-            String[] demos = getAssets().list("demo");
+            String[] demos = getAssets().list("src");
             List<String> ret = new ArrayList<>();
             for (String str : demos) {
                 if (str.endsWith("js")) {
@@ -106,7 +106,7 @@ public class MainActivity extends AppCompatActivity {
                 @Override
                 public void onClick(View v) {
                     Intent intent = new Intent(tv.getContext(), DemoDebugActivity.class);
-                    intent.putExtra("scheme", "assets://demo/" + data[position]);
+                    intent.putExtra("scheme", "assets://src/" + data[position]);
                     intent.putExtra("alias", data[position]);
                     tv.getContext().startActivity(intent);
                 }

doric-android/doric/build.gradle

@@ -21,6 +21,11 @@ android {
             consumerProguardFiles 'proguard-rules.pro'
         }
     }
+    sourceSets {
+        main {
+            assets.srcDirs = [project.getRootDir().getParent() + "/doric-js/bundle"]
+        }
+    }
 }
 
 afterEvaluate {

doric-android/doric/src/main/assets/bundle/.gitignore

@@ -1 +0,0 @@
-*.js

doric-android/doric/src/main/java/pub/doric/utils/DoricConstant.java

@@ -21,8 +21,8 @@ package pub.doric.utils;
  * @CreateDate: 2019-07-18
  */
 public class DoricConstant {
-    public static final String DORIC_BUNDLE_SANDBOX = "bundle/doric-sandbox.js";
+    public static final String DORIC_BUNDLE_SANDBOX = "doric-sandbox.js";
-    public static final String DORIC_BUNDLE_LIB = "bundle/doric-lib.js";
+    public static final String DORIC_BUNDLE_LIB = "doric-lib.js";
     public static final String DORIC_MODULE_LIB = "doric";
 
 

doric-android/version.properties

@@ -1 +1 @@
-version=0.1.2
+version=0.2.0

doric-iOS/Example/Example.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -20,7 +20,7 @@
 		E2334AFE22E9D2070098A085 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E2334AFD22E9D2070098A085 /* main.m */; };
 		E2334B0822E9D2070098A085 /* ExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2334B0722E9D2070098A085 /* ExampleTests.m */; };
 		E2334B1322E9D2070098A085 /* ExampleUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2334B1222E9D2070098A085 /* ExampleUITests.m */; };
-		E2F4481723839AC500073C7F /* demo in Resources */ = {isa = PBXBuildFile; fileRef = E2F4481623839AC500073C7F /* demo */; };
+		E2C9315923B0A263007933D9 /* src in Resources */ = {isa = PBXBuildFile; fileRef = E2C9315823B0A263007933D9 /* src */; };
 		ED1C348399AB9D786E6D0FD4 /* libPods-ExampleUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E7A7F41AFE5065A452873298 /* libPods-ExampleUITests.a */; };
 /* End PBXBuildFile section */
 
@@ -72,7 +72,7 @@
 		E2334B0E22E9D2070098A085 /* ExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		E2334B1222E9D2070098A085 /* ExampleUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExampleUITests.m; sourceTree = "<group>"; };
 		E2334B1422E9D2070098A085 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		E2F4481623839AC500073C7F /* demo */ = {isa = PBXFileReference; lastKnownFileType = folder; path = demo; sourceTree = "<group>"; };
+		E2C9315823B0A263007933D9 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "../../../doric-demo/bundle/src"; sourceTree = "<group>"; };
 		E7A7F41AFE5065A452873298 /* libPods-ExampleUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -152,7 +152,7 @@
 		E2334AED22E9D2060098A085 /* Example */ = {
 			isa = PBXGroup;
 			children = (
-				E2F4481623839AC500073C7F /* demo */,
+				E2C9315823B0A263007933D9 /* src */,
 				E2334AEE22E9D2060098A085 /* AppDelegate.h */,
 				E2334AEF22E9D2060098A085 /* AppDelegate.m */,
 				E2334AF122E9D2060098A085 /* ViewController.h */,
@@ -299,9 +299,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				E2334AFB22E9D2070098A085 /* LaunchScreen.storyboard in Resources */,
-				E2F4481723839AC500073C7F /* demo in Resources */,
 				E2334AF822E9D2070098A085 /* Assets.xcassets in Resources */,
 				E2334AF622E9D2060098A085 /* Main.storyboard in Resources */,
+				E2C9315923B0A263007933D9 /* src in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

doric-iOS/Example/Example/DemoVC.m

@@ -22,7 +22,7 @@ - (void)viewDidLoad {
     self.title = self.filePath;
     self.view.backgroundColor = [UIColor whiteColor];
     NSString *path = [[NSBundle mainBundle] bundlePath];
-    NSString *demoPath = [path stringByAppendingPathComponent:@"demo"];
+    NSString *demoPath = [path stringByAppendingPathComponent:@"src"];
     NSString *fullPath = [demoPath stringByAppendingPathComponent:self.filePath];
     NSString *jsContent = [NSString stringWithContentsOfFile:fullPath encoding:NSUTF8StringEncoding error:nil];
     DoricPanel *panel = [DoricPanel new];

doric-iOS/Example/Example/ViewController.m

@@ -22,7 +22,7 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = @"Doric Demo";
     NSString *path = [[NSBundle mainBundle] bundlePath];
-    NSString *demoPath = [path stringByAppendingPathComponent:@"demo"];
+    NSString *demoPath = [path stringByAppendingPathComponent:@"src"];
     NSFileManager *mgr = [NSFileManager defaultManager];
     self.demoFilePaths = [[mgr subpathsAtPath:demoPath] filter:^BOOL(NSString *obj) {
         return ![obj containsString:@".map"];
@@ -78,7 +78,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     NSString *file = self.demoFilePaths[(NSUInteger) indexPath.row];
     if ([file containsString:@"NavigatorDemo"]) {
         DoricViewController *doricViewController = [[DoricViewController alloc]
-                initWithScheme:[NSString stringWithFormat:@"assets://demo/%@", file]
+                initWithScheme:[NSString stringWithFormat:@"assets://src/%@", file]
                          alias:self.demoFilePaths[(NSUInteger) indexPath.row]
                          extra:nil
         ];

doric-iOS/Example/Example/demo/.gitignore

@@ -1 +0,0 @@
-*.js

doric-iOS/Example/Podfile

@@ -3,7 +3,7 @@
 
 target 'Example' do
 
-  pod 'DoricCore', :path => '../'
+  pod 'DoricCore', :path => '../../'
   target 'ExampleTests' do
     inherit! :search_paths
     # Pods for testing

doric-iOS/Pod/Assets/bundle/.gitignore

@@ -1 +0,0 @@
-*.js

doric-js/.gitignore

@@ -1,5 +1,4 @@
 node_modules/
 build/
-bundle/
 demo/
 .DS_Store

doric-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doric",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "The JS Framework of Doric",
   "main": "bundle/doric-vm.js",
   "scripts": {