update to android studio 3.0

This commit is contained in:
HappyZ 2017-10-30 15:45:50 -05:00
parent 39f0553210
commit 7485e1e97d
5 changed files with 44 additions and 51 deletions

View File

@ -27,17 +27,7 @@
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View File

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.2'
classpath 'com.android.tools.build:gradle:3.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

View File

@ -1,6 +1,6 @@
#Wed Jun 07 14:57:58 PDT 2017
#Sun Oct 29 19:30:12 CDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

View File

@ -22,7 +22,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
@ -76,6 +76,8 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@ -102,33 +104,33 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="mediarouter-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="play-services-cast-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-games-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-wallet-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-drive-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appindexing-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appinvite-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-safetynet-7.8.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-fitness-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-vision-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-nearby-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-location-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appstate-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-identity-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-panorama-7.8.0" level="project" />
<orderEntry type="library" exported="" name="play-services-plus-7.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-appinvite-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:mediarouter-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-nearby-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-drive-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-vision-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-cast-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-maps-7.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-safetynet-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:appcompat-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-ads-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-location-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-analytics-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-games-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-gcm-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-plus-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-wallet-7.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-base-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-appstate-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-fitness-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-appindexing-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-identity-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-panorama-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-annotations:23.0.1@jar" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-wearable-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-7.8.0" level="project" />
</component>
</module>

View File

@ -22,7 +22,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
@ -76,6 +76,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
@ -86,12 +87,12 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="wearable-1.3.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:recyclerview-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-annotations:22.2.0@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-base-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.gms:play-services-wearable-7.8.0" level="project" />
<orderEntry type="library" exported="" name="com.google.android.support:wearable-1.3.0" level="project" />
</component>
</module>