Merge pull request #94 from ysb33r/master

FIXED #83. Updates for appveyor and fix to Windows issue
jruby-gradle · Dec 20, 2014 · 3147226 · mojavelinux · Dec 20, 2014 · ysb33r
2 parents 33b48a6 + 434a916
commit 3147226
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,10 +7,17 @@ build_script:
   - gradlew.bat assemble --info
 
 test_script:
-  - gradlew.bat check --info
+  - gradlew.bat test check --info
 
 branches:
   only:
     - master
     - development
 
+environment:
+  matrix:
+  - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
+  - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0
+  - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
+
diff --git a/src/main/groovy/com/github/jrubygradle/GemUtils.groovy b/src/main/groovy/com/github/jrubygradle/GemUtils.groovy
@@ -104,6 +104,11 @@ class GemUtils {
                     project.logger.debug "Gem installation: Working around bug in jruby 1.7.14"
                     environment HOME : project.gradle.gradleUserHomeDir.absolutePath
                 }
+
+                // Workaround for FFI bug that is seen on some Windows environments
+                if(System.getProperty('os.name').toLowerCase().startsWith('windows')) {
+                  environment 'TMP' : System.env.TMP, 'TEMP' : System.env.TEMP
+                }
             }
         }
     }