Merge pull request #49 from madvay/upd

advayDev1 · advayDev1 · commit b216e41d6fe7 · 2015-10-08T10:42:42.000-07:00
J2ObjC =&gt; 0.9.8.2.1 and JDK 7 to get Xcode 7 support
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@
 
 language: objective-c
 os: osx
+osx_image: xcode7
+
 # Add a TEST_DIR=[directory] row for each library (or group of libraries) to test
 # Each will be run as an independent, hermetic test (in parallel when resources permit)
 # on Traivs.
@@ -26,6 +28,12 @@ branches:
 
 sudo: false
 
+
+before_install:
+  - export TERM=dumb
+  - env
+  - ./j2objc-gradle/install-osx-jdk7.sh
+
 install:
   - export TERM=dumb
   - env
diff --git a/j2objc-gradle b/j2objc-gradle
@@ -1 +1 @@
-Subproject commit 30bb05429c5b0160b242217f276d830e9cd8ed6a
+Subproject commit 04cdb3bc344cd40da118fc68b02d1afb58b6d860
diff --git a/libraryBuilds/prep.sh b/libraryBuilds/prep.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-J2OBJC_VERSION=0.9.8.1
+J2OBJC_VERSION=0.9.8.2.1
 mkdir localJ2objcDist
 mkdir common
 
