Skip to content

Commit c18fe3c

Browse files
author
emmanuel.proulx
committed
Made changed the version of Gradle and Android OS to the latest.
1 parent ee814db commit c18fe3c

3 files changed

Lines changed: 36 additions & 26 deletions

File tree

‎FabricView.iml‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,85 +9,95 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<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" />
1714
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1915
<task>generateDebugSources</task>
2016
</afterSyncTasks>
2117
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2218
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2319
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2420
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2521
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
26-
<option name="LIBRARY_PROJECT" value="true" />
22+
<option name="PROJECT_TYPE" value="1" />
2723
</configuration>
2824
</facet>
2925
</component>
3026
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3127
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
32-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3329
<exclude-output />
3430
<content url="file://$MODULE_DIR$">
3531
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3632
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3733
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3834
<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" />
3936
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
4037
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4138
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4239
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4340
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4441
<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" />
4543
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4644
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4745
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4846
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5350
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5459
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5560
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5661
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5762
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5863
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6064
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6166
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6267
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6368
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6570
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6771
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/android-profile" />
6881
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6983
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7084
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7285
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8491
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8592
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8796
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8897
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
98+
<excludeFolder url="jar://$MODULE_DIR$/build/intermediates/mockable-android-23.jar!/" />
8999
</content>
90-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
100+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
91101
<orderEntry type="sourceFolder" forTests="false" />
92102
</component>
93103
</module>

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.3.1'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99
}
1010
}
1111

1212

1313
apply plugin: 'com.android.library'
1414

1515
android {
16-
compileSdkVersion 23
17-
buildToolsVersion "23.0.1"
16+
compileSdkVersion 25
17+
buildToolsVersion "25.0.3"
1818

1919
defaultConfig {
20-
minSdkVersion 15
21-
targetSdkVersion 23
20+
minSdkVersion 17
21+
targetSdkVersion 25
2222
versionCode 1
2323
versionName "0.1"
2424
}

‎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 Oct 24 07:35:34 PDT 2015
1+
#Sun Aug 27 18:04:31 EDT 2017
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.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)