diff --git a/android/project.properties b/android/project.properties index 4ab125693c7c484a0252ee7eca9616e0f9b1ac67..6e18427a424c3cf39957ac812bf4dcc07cfd2865 100644 --- a/android/project.properties +++ b/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-19 +target=android-21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8e600c93260128cdc95c6cbd36ef5b2a27ec2ae9..d10c2e013a9f5154192ccb4c657afdac39d046ae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Sep 21 13:08:26 CEST 2013 +#Fri Jan 09 13:07:45 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/ios/robovm.xml b/ios/robovm.xml index df09d9d003bd703d3ca430e434a3c5e067d33d82..01f9da666b70240064ad1776038940b3e116bfea 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -20,7 +20,7 @@ <forceLinkClasses> <pattern>com.badlogic.gdx.scenes.scene2d.ui.*</pattern> <pattern>com.badlogic.gdx.physics.bullet.**</pattern> - <pattern>com.android.okhttp.HttpHandler</pattern> + <pattern>com.android.okhttp.HttpHandler</pattern> <pattern>com.android.okhttp.HttpsHandler</pattern> <pattern>com.android.org.conscrypt.**</pattern> <pattern>com.android.org.bouncycastle.jce.provider.BouncyCastleProvider</pattern> @@ -32,7 +32,9 @@ <pattern>org.apache.harmony.security.provider.cert.DRLCertFactory</pattern> <pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern> </forceLinkClasses> - <libs> + <libs> + <lib>build/libs/ios/libObjectAL.a</lib> + <lib>build/libs/ios/libgdx.a</lib> </libs> <frameworks> <framework>UIKit</framework>