Use platform-25 for android tests

Add Android platform-25 to dependencies
Update platform tools to 25.0.3
This commit is contained in:
Vyacheslav Gerasimov
2017-04-26 22:42:41 +03:00
parent 7af10769c9
commit 9552666aa6
2 changed files with 19 additions and 2 deletions
+18 -1
View File
@@ -34,8 +34,9 @@
<mkdir dir="${android.sdk.dir}/build-tools"/> <mkdir dir="${android.sdk.dir}/build-tools"/>
<download_android_platform android.versioncode="23_r01" android.sdk.version="23" android.full.version="6.0" /> <download_android_platform android.versioncode="23_r01" android.sdk.version="23" android.full.version="6.0" />
<download_android_platform_new android.versioncode="25_r01" android.sdk.version="25" android.full.version="7.1.1" />
<download_platform_tools android.platform.tools.version="23" /> <download_platform_tools android.platform.tools.version="25.0.3" />
<download_tools android.tools.version="24.3.4" /> <download_tools android.tools.version="24.3.4" />
<download_build_tools android.build.tools.version="23.0.1" android.build.tools.full.version="6.0" /> <download_build_tools android.build.tools.version="23.0.1" android.build.tools.full.version="6.0" />
</target> </target>
@@ -67,6 +68,22 @@
</sequential> </sequential>
</macrodef> </macrodef>
<macrodef name="download_android_platform_new">
<attribute name="android.versioncode" />
<attribute name="android.sdk.version" />
<attribute name="android.full.version" />
<sequential>
<get src="http://dl-ssl.google.com/android/repository/platform-@{android.versioncode}.zip"
dest="${download.dir}/android-platform-@{android.versioncode}.zip" usetimestamp="true"/>
<unzip src="${download.dir}/android-platform-@{android.versioncode}.zip" dest="${android.sdk.dir}/platforms"/>
<move file="${android.sdk.dir}/platforms/android-@{android.full.version}" tofile="${android.sdk.dir}/platforms/android-@{android.sdk.version}"/>
<delete dir="${android.sdk.dir}/platforms/android-@{android.full.version}"/>
</sequential>
</macrodef>
<macrodef name="download_platform_tools"> <macrodef name="download_platform_tools">
<attribute name="android.platform.tools.version" /> <attribute name="android.platform.tools.version" />
@@ -34,6 +34,6 @@ public class TestUtils {
@NonNull @NonNull
public static String getLatestAndroidPlatform() { public static String getLatestAndroidPlatform() {
return "android-23"; return "android-25";
} }
} }