From d082df82c5eb16355c267884489e6c369feb185f Mon Sep 17 00:00:00 2001
From: Mahmoud Abdelkader <mahmoudimus@users.noreply.github.com>
Date: Tue, 2 Mar 2021 10:02:29 -0800
Subject: [PATCH] Fix Failing CI setup (#58)

* use detected.name and detected.arch instead of .classifier which has better luck

* Update reflect-config with new module structure from Larky

* Missed larky.modules in front of larky.types Larky
---
 pom.xml                                       | 23 +++++--------
 runlarky/pom.xml                              |  7 +++-
 .../src/main/resources/reflect-config.json    | 34 ++++++++++++-------
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b3819f97..44b150e77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
             <groupId>org.conscrypt</groupId>
             <artifactId>conscrypt-openjdk</artifactId>
             <version>${org.conscrypt.version}</version>
-            <classifier>${os.detected.classifier}</classifier>
+            <classifier>${os.detected.name}-${os.detected.arch}</classifier>
         </dependency>
 
         <dependency>
@@ -161,6 +161,14 @@
     </dependencies>
 
     <build>
+        <extensions>
+            <extension>
+              <groupId>kr.motd.maven</groupId>
+              <artifactId>os-maven-plugin</artifactId>
+              <version>${os-maven-plugin.version}</version>
+            </extension>
+        </extensions>
+
         <plugins>
 
             <plugin>
@@ -214,19 +222,6 @@
                 <artifactId>maven-source-plugin</artifactId>
                 <version>${maven.source.plugin.version}</version>
             </plugin>
-            <plugin>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>${os-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>detect</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/runlarky/pom.xml b/runlarky/pom.xml
index 4ee0a63bb..31f646cb9 100644
--- a/runlarky/pom.xml
+++ b/runlarky/pom.xml
@@ -85,7 +85,12 @@
                 <version>${protobuf-maven-plugin}</version>
                 <configuration>
                     <protocArtifact>
-                        com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+                    <!--
+                        See https://github.com/verygoodsecurity/starlarky/pull/58 for why
+                        ${os.detected.classifier} didn't work in some cases for my environment but
+                        ${os.detected.name}-${os.detected.arch} works better!
+                    -->
+                        com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.name}-${os.detected.arch}
                     </protocArtifact>
                 </configuration>
                 <executions>
diff --git a/runlarky/src/main/resources/reflect-config.json b/runlarky/src/main/resources/reflect-config.json
index 61e313825..9a1ea2069 100644
--- a/runlarky/src/main/resources/reflect-config.json
+++ b/runlarky/src/main/resources/reflect-config.json
@@ -1,6 +1,6 @@
 [
   {
-    "name": "com.verygood.security.larky.nativelib.LarkyGlobals",
+    "name": "com.verygood.security.larky.modules.globals.LarkyGlobals",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -8,7 +8,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.nativelib.PythonBuiltins",
+    "name": "com.verygood.security.larky.modules.globals.PythonBuiltins",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -16,7 +16,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.nativelib.std.Json",
+    "name": "com.verygood.security.larky.modules.JsonModule",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -24,7 +24,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.nativelib.std.Proto",
+    "name": "com.verygood.security.larky.modules.ProtoBufModule",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -32,7 +32,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.nativelib.std.C99Math",
+    "name": "com.verygood.security.larky.modules.C99MathModule",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -40,7 +40,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.nativelib.std.Hashlib",
+    "name": "com.verygood.security.larky.modules.HashModule",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -48,7 +48,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.stdtypes.structs.MutableStruct",
+    "name": "com.verygood.security.larky.modules.RegexModule",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -56,7 +56,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.stdtypes.structs.SimpleStruct",
+    "name": "com.verygood.security.larky.modules.types.structs.MutableStruct",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -64,7 +64,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.nativelib.LarkyProperty",
+    "name": "com.verygood.security.larky.modules.types.structs.SimpleStruct",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -72,7 +72,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "net.starlark.java.eval.Dict",
+    "name": "com.verygood.security.larky.modules.types.Property",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -80,7 +80,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "net.starlark.java.eval.StringModule",
+    "name": "com.verygood.security.larky.modules.types.Partial",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -88,7 +88,7 @@
     "allPublicConstructors": true
   },
   {
-    "name": "net.starlark.java.eval.StarlarkList",
+    "name": "net.starlark.java.eval.Dict",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,
@@ -96,7 +96,15 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.verygood.security.larky.stdtypes.hashing.HashObject",
+    "name": "net.starlark.java.eval.StringModule",
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true
+  },
+  {
+    "name": "net.starlark.java.eval.StarlarkList",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true,