v1.33.0 (#218)

* v1.33.0 * fix android sdk setup o Windoes * android sdk avd-list command
project-talan · Sep 21, 2021 · 087343d · 087343d
1 parent a232f65
commit 087343d
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 30 deletions.
diff --git a/components/amazon/aws-cli/components.js b/components/amazon/aws-cli/components.js
diff --git a/components/android/android-sdk/.tln.conf b/components/android/android-sdk/.tln.conf
@@ -15,9 +15,10 @@ module.exports = {
       .option('package', { describe: 'SDK package id', default: [], type: 'array' });
   },
   env: async (tln, env) => {
-    // env.ANDROID_HOME = env.TLN_COMPONENT_HOME; DEPRICATED
+    env.ANDROID_HOME = env.TLN_COMPONENT_HOME; //DEPRICATED
     env.ANDROID_SDK_ROOT = env.TLN_COMPONENT_HOME;
     env.PATH = [
+      path.join(env.TLN_COMPONENT_HOME, 'emulator'),
       path.join(env.TLN_COMPONENT_HOME, 'tools'),
       path.join(env.TLN_COMPONENT_HOME, 'cmdline-tools', 'latest', 'bin'),
       path.join(env.TLN_COMPONENT_HOME, 'platform-tools'),
@@ -37,22 +38,26 @@ module.exports = {
         if (version && tln.canInstallComponent(tln, id, home)) {
           script.set(
             ['mkdir latest'].concat(tln.getDownloadScript(tln, {
-            'linux': {
-              name: `commandlinetools-linux-${version}_latest.zip`,
-              opts: { src: `cmdline-tools`, flt: '*', dest: `latest/`, rmv: null},
-              url: `https://dl.google.com/android/repository/commandlinetools-linux-${version}_latest.zip`
-            },
-            'darwin': {
-              name: `commandlinetools-mac-${version}_latest.zip`,
-              opts: { src: `cmdline-tools`, flt: '*', dest: `latest/`, rmv: null},
-              url: `https://dl.google.com/android/repository/commandlinetools-mac-${version}_latest.zip`
-            },
-            'win32': {
-              name: `commandlinetools-win-${version}_latest.zip`,
-              opts: { src: `cmdline-tools`, flt: '*', dest: `latest/`, rmv: null},
-              url: `https://dl.google.com/android/repository/commandlinetools-win-${version}_latest.zip`
-            }
-          }), ['mv latest cmdline-tools/']));
+              'linux': {
+                name: `commandlinetools-linux-${version}_latest.zip`,
+                opts: { src: `cmdline-tools`, flt: '*', dest: `latest/`, rmv: null},
+                url: `https://dl.google.com/android/repository/commandlinetools-linux-${version}_latest.zip`,
+                cmd: 'mv latest cmdline-tools/'
+              },
+              'darwin': {
+                name: `commandlinetools-mac-${version}_latest.zip`,
+                opts: { src: `cmdline-tools`, flt: '*', dest: `latest/`, rmv: null},
+                url: `https://dl.google.com/android/repository/commandlinetools-mac-${version}_latest.zip`,
+                cmd: 'mv latest cmdline-tools/'
+              },
+              'win32': {
+                name: `commandlinetools-win-${version}_latest.zip`,
+                opts: { src: `cmdline-tools`, flt: '*', dest: `latest/`, rmv: null},
+                url: `https://dl.google.com/android/repository/commandlinetools-win-${version}_latest.zip`,
+                cmd: 'move latest cmdline-tools/latest'
+              }
+            }))
+          );
         }
       }
     },
@@ -87,7 +92,17 @@ module.exports = {
       builder: async (tln, script) => script.set([
         'sdkmanager --update'
       ])
-    }
+    },
+    {
+      id: 'avd-list',
+      filter: '',
+      builder: async (tln, script) => script.set([
+        'sdkmanager --update'
+      ])
+    },
+
+//avdmanager list
+
   ],
   components: async (tln) => [
     { id: 'android-sdk-6200805' },

diff --git a/components/angular/components.js b/components/angular/components.js
diff --git a/components/bitcoin-core/components.js b/components/bitcoin-core/components.js
diff --git a/components/cmake/components.js b/components/cmake/components.js
diff --git a/components/flutter/components.js b/components/flutter/components.js