Skip to content
This repository was archived by the owner on Feb 25, 2022. It is now read-only.

Commit f73ef8a

Browse files
author
Hisanobu Tomari
committed
Fix things up for Android Studio 2.0 environment
1 parent c49758e commit f73ef8a

File tree

6 files changed

+42
-18
lines changed

6 files changed

+42
-18
lines changed

‎.idea/encodings.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,13 +47,27 @@
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5357
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5660
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5761
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6071
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6172
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6273
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -65,24 +76,25 @@
6576
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6677
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6981
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
8191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
8393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
8495
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8698
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8799
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
88100
</content>

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22
android {
33
compileSdkVersion 23
4-
buildToolsVersion '23.0.1'
4+
buildToolsVersion '23.0.3'
55
defaultConfig {
66
applicationId "com.example.javabutton"
77
minSdkVersion 8

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:1.4.0-beta3'
7+
classpath 'com.android.tools.build:gradle:2.0.0'
88
}
99
}
1010

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Sat Apr 09 15:28:07 JST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 commit comments

Comments
 (0)