karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bump SDK versions

Browse Source
This commit is contained in:
Plonk42
2016-02-19 00:26:12 +01:00
parent 592333afab
commit a4c41643f0
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
myTracks/build.gradle
+4 -3
View File
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 17 compileSdkVersion 23
buildToolsVersion "23.0.2" buildToolsVersion "23.0.2"
useLibrary 'org.apache.http.legacy'
defaultConfig { defaultConfig {
applicationId "com.google.android.maps.mytracks" applicationId "com.google.android.maps.mytracks"
minSdkVersion 9 minSdkVersion 17
targetSdkVersion 19 targetSdkVersion 23
testApplicationId "com.google.android.maps.mytracks.test" testApplicationId "com.google.android.maps.mytracks.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner" testInstrumentationRunner "android.test.InstrumentationTestRunner"
myTracks/myTracks.iml
+4 -3
View File
@@ -26,7 +26,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output /> <exclude-output />
@@ -79,7 +79,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="google-oauth-client-1.12.0-beta" level="project" /> <orderEntry type="library" exported="" name="google-oauth-client-1.12.0-beta" level="project" />
<orderEntry type="library" exported="" name="google-api-services-fusiontables-v1-rev16-1.12.0-beta" level="project" /> <orderEntry type="library" exported="" name="google-api-services-fusiontables-v1-rev16-1.12.0-beta" level="project" />
@@ -109,6 +109,7 @@
<orderEntry type="library" exported="" name="guava-jdk5-13.0" level="project" /> <orderEntry type="library" exported="" name="guava-jdk5-13.0" level="project" />
<orderEntry type="library" exported="" name="gdata-spreadsheet-meta-3.0" level="project" /> <orderEntry type="library" exported="" name="gdata-spreadsheet-meta-3.0" level="project" />
<orderEntry type="module" module-name="myTracksLib" exported="" /> <orderEntry type="module" module-name="myTracksLib" exported="" />
<orderEntry type="library" exported="" name="android-android-17" level="project" /> <orderEntry type="library" exported="" name="android-android-23" level="project" />
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
</component> </component>
</module> </module>
myTracksLib/build.gradle
+3 -3
View File
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 17 compileSdkVersion 23
buildToolsVersion "23.0.2" buildToolsVersion "23.0.2"
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 17
targetSdkVersion 19 targetSdkVersion 23
} }
buildTypes { buildTypes {
myTracksLib/myTracksLib.iml
+3 -3
View File
@@ -27,7 +27,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output /> <exclude-output />
@@ -80,9 +80,9 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="protobuf-java-2.3.0-lite" level="project" /> <orderEntry type="library" exported="" name="protobuf-java-2.3.0-lite" level="project" />
<orderEntry type="library" exported="" name="android-android-17" level="project" /> <orderEntry type="library" exported="" name="android-android-23" level="project" />
</component> </component>
</module> </module>
mytracks.iml
+1 -1
View File
@@ -8,7 +8,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />