Merge branch '162-build-with-latest-sdk' into 'master'

Build with SDK 23, continue to target SDK 22. #162

This will allow people to download Android Studio, check out and build the project without extra steps. Compiling with the latest SDK is recommended even if your target is older (as ours is).

See merge request !6
This commit is contained in:
Torsten Grote
2015-12-08 14:10:07 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -62,7 +62,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
<orderEntry type="library" exported="" name="jtorctl-briar" level="project" />

View File

@@ -9,8 +9,8 @@ dependencies {
}
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.2"
sourceSets {
main {