swiftkotlin対応ビルド

code4history · May 17, 2019 · 0741ca6 · 0741ca6
1 parent a1f7cea
commit 0741ca6
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 15 deletions.
diff --git a/dist/maplat.js b/dist/maplat.js
diff --git a/dist/maplat_core.js b/dist/maplat_core.js
diff --git a/example.zip b/example.zip
diff --git a/gulpfile.js b/gulpfile.js
@@ -107,10 +107,24 @@ gulp.task('mobile_build_task', function() {
     removeResource();
     copyResource(mobileCopy);
     copyResource(mobileBaseCopy);
-    fs.copySync('mobile.html', './mobile_android/lib-maplat/src/main/res/raw/mobile_html');
-    fs.copySync('mobile.html', './mobile_ios_lib/MaplatView/Maplat.bundle/mobile.html');
+    fs.copySync('mobile.html', './mobile_android/mobile_android_lib/src/main/res/raw/mobile_html');
+    fs.copySync('mobile.html', './mobile_ios/mobile_ios_lib/MaplatView/Maplat.bundle/mobile.html');
     copyAssets();
-    return Promise.resolve();
+    return Promise.all([new Promise(function(resolve, reject) {
+        gulp.src(['./mobile_android/mobile_android_lib/build.gradle'])
+            .pipe(concat('build.gradle'))
+            .pipe(replace(/def VERSION_NAME = ".+"/g, 'def VERSION_NAME = "' + pkg.version + '"'))
+            .on('error', reject)
+            .pipe(gulp.dest('./mobile_android/mobile_android_lib/'))
+            .on('end', resolve);
+    }),new Promise(function(resolve, reject) {
+        gulp.src(['./mobile_ios/mobile_ios_lib/MaplatView/Info.plist'])
+            .pipe(concat('Info.plist'))
+            .pipe(replace(/<key>CFBundleShortVersionString<\/key>\n\t<string>.+<\/string>/g, '<key>CFBundleShortVersionString</key>\n\t<string>' + pkg.version + '</string>'))
+            .on('error', reject)
+            .pipe(gulp.dest('./mobile_ios/mobile_ios_lib/MaplatView/'))
+            .on('end', resolve);
+    })]);
 });
 
 gulp.task('mobile_build', gulp.series('js_build', 'css_build', 'mobile_build_task'));

diff --git a/mobile_android/mobile_android_lib/build.gradle b/mobile_android/mobile_android_lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
-def VERSION_NAME = "0.1.1"
+def VERSION_NAME = "0.4.9"
 
 android {
     compileSdkVersion 27

diff --git a/mobile_android/mobile_android_lib/src/main/res/raw/dist_maplat_core_js b/mobile_android/mobile_android_lib/src/main/res/raw/dist_maplat_core_js
@@ -1,6 +1,6 @@
 /**
  * Maplat - Maplat is the cool Historical Map/Illustrated Map Viewer. It can transform each map coordinates with nonlinear but bijective projection and makes possible that the maps can collaborate with GPS/accurate maps, without distorting original maps. Data editor of this solution is provided as another project, MaplatEditor.
- * @version v0.4.8
+ * @version v0.4.9
  * @link https://github.com/code4nara/Maplat/wiki
  * @license MIT
  * Copyright (c) 2015- Kohei Otsuka, Code for Nara, RekishiKokudo project

diff --git a/mobile_android/mobile_android_sample/app/build.gradle b/mobile_android/mobile_android_sample/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    //buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "jp.tilemap.maplatapptest"
         minSdkVersion 21

diff --git a/mobile_android/mobile_android_sample_kotlin/app/build.gradle b/mobile_android/mobile_android_sample_kotlin/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    //buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "jp.tilemap.maplatapptest"
         minSdkVersion 21

diff --git a/mobile_ios/mobile_ios_lib/MaplatView/Info.plist b/mobile_ios/mobile_ios_lib/MaplatView/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.4.9</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/mobile_ios/mobile_ios_lib/MaplatView/Maplat.bundle/dist/maplat_core.js b/mobile_ios/mobile_ios_lib/MaplatView/Maplat.bundle/dist/maplat_core.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Maplat",
   "description": "Maplat is the cool Historical Map/Illustrated Map Viewer. It can transform each map coordinates with nonlinear but bijective projection and makes possible that the maps can collaborate with GPS/accurate maps, without distorting original maps. Data editor of this solution is provided as another project, MaplatEditor.",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "homepage": "https://github.com/code4nara/Maplat/wiki",
   "license": "MIT",
   "scripts": {

diff --git a/service-worker.js b/service-worker.js
@@ -24,11 +24,11 @@ workbox.clientsClaim();
 self.__precacheManifest = [
   {
     "url": ".",
-    "revision": "Thu May 09 2019 20:41:51 GMT+0900 (GMT+09:00)"
+    "revision": "Fri May 17 2019 17:43:41 GMT+0900 (GMT+09:00)"
   },
   {
     "url": "dist/maplat.js",
-    "revision": "6ee434ad45cd49c37bd71eed7a693edc"
+    "revision": "4567f1aaaa54da6233e5524699e0ddb7"
   },
   {
     "url": "dist/maplat.css",