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

Commit 3262941

Browse files
author
Hisanobu Tomari
committed
Update SDK to Android-25
1 parent 37006ce commit 3262941

File tree

5 files changed

+25
-22
lines changed

5 files changed

+25
-22
lines changed

‎.idea/gradle.xml‎

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

‎app/app.iml‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4244
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4345
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -47,58 +49,64 @@
4749
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4850
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4951
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5053
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5154
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5457
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5558
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5659
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5761
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6064
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6165
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6266
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6367
<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" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
7169
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7270
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7371
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7472
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7573
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7674
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7775
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7885
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7986
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8087
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
8389
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8490
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
8692
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
8794
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
8896
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
8997
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9299
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
93100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
95102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
96104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
97105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
98106
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
99107
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
100108
</content>
101-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
109+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
102110
<orderEntry type="sourceFolder" forTests="false" />
103111
</component>
104112
</module>

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22
android {
3-
compileSdkVersion 23
4-
buildToolsVersion '23.0.3'
3+
compileSdkVersion 25
4+
buildToolsVersion '25.0.1'
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:2.0.0'
7+
classpath 'com.android.tools.build:gradle:2.2.3'
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-
#Sat Apr 09 15:28:07 JST 2016
1+
#Sat Dec 10 13:58:52 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.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)