chore: version migration to 6

NickIliev · Jul 16, 2019 · 8757261 · 8757261
1 parent 40ca980
commit 8757261
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 47 deletions.
diff --git a/app/App_Resources/Android/app.gradle b/app/App_Resources/Android/app.gradle
@@ -13,42 +13,42 @@ android {
     multiDexEnabled true
     minSdkVersion 19
     targetSdkVersion 28
-    ndk {
-      abiFilters.clear() // ABI Splits related code - I need NDK 17rc1 to ensure proper ABI splits creation
-    }
+    // ndk {
+    //   abiFilters.clear() // ABI Splits related code - I need NDK 17rc1 to ensure proper ABI splits creation
+    // }
   }  
 
-  // ABI Splits related code
-  splits {
-
-    // Configures multiple APKs based on Applicaiton Binary Interfaces (ABI)
-    abi {
-      enable true // enables the ABIs split mechanism
-      reset() // Clears the default list from all ABIs to no ABIs
-      include 'arm64-v8a', 'armeabi-v7a', 'x86' // Spcifies a list of ABIs Gradle should createa APKs for.
-      universalApk true // false to skip generting the universal APK
-    }
-  } 
-
-  // ABI Splits related code
-  sourceSets {
-      main {
-          jniLibs.srcDirs = ["$projectDir/libs/jni", "$projectDir/snapshot-build/build/ndk-build/libs"]
-      }
-  }
-
-  // ABI Splits related code - Different version codes (so I could upload the different splits to Google Console)
-  project.ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3].withDefault{0}
-
-  android.applicationVariants.all { variant ->
-      variant.outputs.each { output ->
-          def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter("ABI"), 0)
-
-          if (baseAbiVersionCode != null) {
-              output.versionCodeOverride = baseAbiVersionCode * 100000 + variant.versionCode
-          }
-      }
-  }
+  // // ABI Splits related code
+  // splits {
+
+  //   // Configures multiple APKs based on Applicaiton Binary Interfaces (ABI)
+  //   abi {
+  //     enable true // enables the ABIs split mechanism
+  //     reset() // Clears the default list from all ABIs to no ABIs
+  //     include 'arm64-v8a', 'armeabi-v7a', 'x86' // Spcifies a list of ABIs Gradle should createa APKs for.
+  //     universalApk true // false to skip generting the universal APK
+  //   }
+  // } 
+
+  // // ABI Splits related code
+  // sourceSets {
+  //     main {
+  //         jniLibs.srcDirs = ["$projectDir/libs/jni", "$projectDir/snapshot-build/build/ndk-build/libs"]
+  //     }
+  // }
+
+  // // ABI Splits related code - Different version codes (so I could upload the different splits to Google Console)
+  // project.ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3].withDefault{0}
+
+  // android.applicationVariants.all { variant ->
+  //     variant.outputs.each { output ->
+  //         def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter("ABI"), 0)
+
+  //         if (baseAbiVersionCode != null) {
+  //             output.versionCodeOverride = baseAbiVersionCode * 100000 + variant.versionCode
+  //         }
+  //     }
+  // }
 
   aaptOptions {  
     additionalParameters "--no-version-vectors"  

diff --git a/app/App_Resources/Android/src/main/AndroidManifest.xml b/app/App_Resources/Android/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="__PACKAGE__"
-	android:versionCode="27"
-	android:versionName="2.9.0">
+	android:versionCode="28"
+	android:versionName="2.9.1">
 
 	<supports-screens
 		android:smallScreens="true"

diff --git a/nsconfig.json b/nsconfig.json
@@ -1,3 +1 @@
-{
-    "useLegacyWorkflow": false
-}
+{}
diff --git a/package.json b/package.json
@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.curiosity",
     "tns-android": {
-      "version": "6.0.0-2019-06-27-141115-01"
+      "version": "6.0.0"
     },
     "tns-ios": {
-      "version": "6.0.0-2019-07-03-115841-01"
+      "version": "6.0.0"
     }
   },
   "dependencies": {
@@ -22,17 +22,17 @@
     "@angular/platform-browser": "~8.0.0",
     "@angular/platform-browser-dynamic": "~8.0.0",
     "@angular/router": "~8.0.0",
-    "nativescript-angular": "8.1.0-next-2019-07-04-092208-01",
+    "nativescript-angular": "8.0.2",
     "nativescript-app-center": "^1.0.3",
     "nativescript-cardview": "^3.2.0",
     "nativescript-permissions": "^1.3.6",
     "nativescript-plugin-firebase": "^9.0.1",
     "nativescript-social-share": "^1.5.2",
     "nativescript-theme-core": "^1.0.6",
-    "nativescript-ui-sidedrawer": "androidx",
+    "nativescript-ui-sidedrawer": "7.0.0",
     "reflect-metadata": "~0.1.13",
     "rxjs": "^6.3.3",
-    "tns-core-modules": "6.1.0-next-2019-07-03-144356-02",
+    "tns-core-modules": "6.0.1",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {
@@ -45,7 +45,7 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-webpack": "1.0.0-next-2019-06-28-135258-05",
+    "nativescript-dev-webpack": "1.0.0",
     "tns-platform-declarations": "next",
     "tslint": "^5.11.0",
     "typescript": "~3.4.5"

diff --git a/webpack.config.js b/webpack.config.js
@@ -32,7 +32,6 @@ module.exports = env => {
 
     // Default destination inside platforms/<platform>/...
     const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
-    const appResourcesPlatformDir = platform === "android" ? "Android" : "iOS";
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
@@ -109,6 +108,7 @@ module.exports = env => {
         itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
     }
 
+    nsWebpack.processAppComponents(appComponents, platform);
     const config = {
         mode: production ? "production" : "development",
         context: appFullPath,
@@ -213,6 +213,7 @@ module.exports = env => {
                                 unitTesting,
                                 appFullPath,
                                 projectRoot,
+                                ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
                             }
                         },
                     ].filter(loader => !!loader)
@@ -262,12 +263,13 @@ module.exports = env => {
             // Define useful constants like TNS_WEBPACK
             new webpack.DefinePlugin({
                 "global.TNS_WEBPACK": "true",
-                "process": undefined,
+                "process": "global.process",
             }),
             // Remove all files from the out dir.
             new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),
             // Copy assets to out dir. Add your own globs as needed.
             new CopyWebpackPlugin([
+                { from: { glob: "settings.json"} }, // HERE
                 { from: { glob: "fonts/**" } },
                 { from: { glob: "**/*.jpg" } },
                 { from: { glob: "**/*.png" } },