Merged in ANDDEP-263-AndroidStandardLocalConnectionFix (pull request …

…#222) ANDDEP-263 AndroidStandardLocalConnectionFix Approved-by: Максим Туев <[email protected]>
surfstudio · Sep 4, 2018 · 61f53ae · 61f53ae
2 parents a2dcb01 + 9a14d7a
commit 61f53ae
Show file tree

Hide file tree

Showing 9 changed files with 261 additions and 249 deletions.
diff --git a/modules.gradle b/modules.gradle
@@ -1,8 +1,7 @@
 import groovy.json.JsonSlurper
 
 gradle.ext {
-    modules = Module.modules('modules.json', 'modules')
-    samples = Module.modules('samples.json', 'samples')
+    extractModules = { jsonFilePath -> Module.modules(jsonFilePath) }
 }
 
 class Module {
@@ -14,14 +13,13 @@ class Module {
         this.path = path
     }
 
-    static def modules(final String fileName, final String modulesArrayName) {
+    static def modules(final String fileName) {
         try {
             def jsonObject = new JsonSlurper().parse(new File(fileName), 'utf-8')
-            assert jsonObject instanceof Map
-            assert jsonObject."$modulesArrayName" instanceof List
+            assert jsonObject instanceof List
 
             def list = []
-            jsonObject."$modulesArrayName".each {
+            jsonObject.each {
                 list.add(new Module(it.name, it.path))
             }
 

diff --git a/modules.json b/modules.json
@@ -1,132 +1,130 @@
-{
-  "modules": [
-    {
-      "name": "core-app",
-      "path": ""
-    },
-    {
-      "name": "core-ui",
-      "path": ""
-    },
-    {
-      "name": "core-mvp",
-      "path": ""
-    },
-    {
-      "name": "core-mvp-binding",
-      "path": ""
-    },
-    {
-      "name": "analytics",
-      "path": ""
-    },
-    {
-      "name": "network",
-      "path": ""
-    },
-    {
-      "name": "filestorage",
-      "path": ""
-    },
-    {
-      "name": "push",
-      "path": ""
-    },
-    {
-      "name": "dagger-scope",
-      "path": ""
-    },
-    {
-      "name": "logger",
-      "path": ""
-    },
-    {
-      "name": "converter-gson",
-      "path": ""
-    },
-    {
-      "name": "easyadapter",
-      "path": ""
-    },
-    {
-      "name": "recycler-extension",
-      "path": ""
-    },
-    {
-      "name": "datalist-limit-offset",
-      "path": ""
-    },
-    {
-      "name": "datalist-page-count",
-      "path": ""
-    },
-    {
-      "name": "firebase-analytics",
-      "path": ""
-    },
-    {
-      "name": "rx-extension",
-      "path": ""
-    },
-    {
-      "name": "connection",
-      "path": ""
-    },
-    {
-      "name": "standard-dialog",
-      "path": ""
-    },
-    {
-      "name": "util-ktx",
-      "path": ""
-    },
-    {
-      "name": "app-migration",
-      "path": ""
-    },
-    {
-      "name": "shared-pref",
-      "path": ""
-    },
-    {
-      "name": "custom-view",
-      "path": ""
-    },
-    {
-      "name": "mvp-dialog",
-      "path": ""
-    },
-    {
-      "name": "mvp-widget",
-      "path": ""
-    },
-    {
-      "name": "camera-view",
-      "path": ""
-    },
-    {
-      "name": "picture-provider",
-      "path": ""
-    },
-    {
-      "name": "imageloader",
-      "path": ""
-    },
-    {
-      "name": "animations",
-      "path": ""
-    },
-    {
-      "name": "broadcast-extension",
-      "path": ""
-    },
-    {
-      "name": "message-controller",
-      "path": ""
-    },
-    {
-      "name": "location",
-      "path": ""
-    }
-  ]
-}
+[
+  {
+    "name": "core-app",
+    "path": ""
+  },
+  {
+    "name": "core-ui",
+    "path": ""
+  },
+  {
+    "name": "core-mvp",
+    "path": ""
+  },
+  {
+    "name": "core-mvp-binding",
+    "path": ""
+  },
+  {
+    "name": "analytics",
+    "path": ""
+  },
+  {
+    "name": "network",
+    "path": ""
+  },
+  {
+    "name": "filestorage",
+    "path": ""
+  },
+  {
+    "name": "push",
+    "path": ""
+  },
+  {
+    "name": "dagger-scope",
+    "path": ""
+  },
+  {
+    "name": "logger",
+    "path": ""
+  },
+  {
+    "name": "converter-gson",
+    "path": ""
+  },
+  {
+    "name": "easyadapter",
+    "path": ""
+  },
+  {
+    "name": "recycler-extension",
+    "path": ""
+  },
+  {
+    "name": "datalist-limit-offset",
+    "path": ""
+  },
+  {
+    "name": "datalist-page-count",
+    "path": ""
+  },
+  {
+    "name": "firebase-analytics",
+    "path": ""
+  },
+  {
+    "name": "rx-extension",
+    "path": ""
+  },
+  {
+    "name": "connection",
+    "path": ""
+  },
+  {
+    "name": "standard-dialog",
+    "path": ""
+  },
+  {
+    "name": "util-ktx",
+    "path": ""
+  },
+  {
+    "name": "app-migration",
+    "path": ""
+  },
+  {
+    "name": "shared-pref",
+    "path": ""
+  },
+  {
+    "name": "custom-view",
+    "path": ""
+  },
+  {
+    "name": "mvp-dialog",
+    "path": ""
+  },
+  {
+    "name": "mvp-widget",
+    "path": ""
+  },
+  {
+    "name": "camera-view",
+    "path": ""
+  },
+  {
+    "name": "picture-provider",
+    "path": ""
+  },
+  {
+    "name": "imageloader",
+    "path": ""
+  },
+  {
+    "name": "animations",
+    "path": ""
+  },
+  {
+    "name": "broadcast-extension",
+    "path": ""
+  },
+  {
+    "name": "message-controller",
+    "path": ""
+  },
+  {
+    "name": "location",
+    "path": ""
+  }
+]