Skip to content

Commit 668af70

Browse files
NosfistisNosfistis
committed
chore(sdk): Updated to v25
Updated to newest gradle & android sdk 25 build tools
1 parent d710ef5 commit 668af70

File tree

14 files changed

+574
-109
lines changed

14 files changed

+574
-109
lines changed

‎.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/dictionaries/Mike.xml

-3
This file was deleted.

‎.idea/gradle.xml

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/inspectionProfiles/Project_Default.xml

-10
This file was deleted.

‎.idea/inspectionProfiles/profiles_settings.xml

-7
This file was deleted.

‎.idea/misc.xml

+1-35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Refene.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app-release.apk

1.13 MB
Binary file not shown.

‎app/app.iml

+48-25
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
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" />
@@ -28,67 +24,94 @@
2824
</component>
2925
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3026
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3228
<exclude-output />
3329
<content url="file://$MODULE_DIR$">
3430
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3531
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3632
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3733
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3835
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4037
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4138
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4239
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4340
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4442
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4644
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4745
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4846
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51-
<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/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5358
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5459
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5560
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5661
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5762
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
58-
<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/main/shaders" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6677
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6881
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7690
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
7892
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
8094
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
8197
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8399
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
84100
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
85101
</content>
86-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
102+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
87103
<orderEntry type="sourceFolder" forTests="false" />
88-
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
89-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
90-
<orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
91-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
92-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
104+
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
105+
<orderEntry type="library" exported="" name="cardview-v7-25.3.1" level="project" />
106+
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
107+
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
108+
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
109+
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
110+
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
111+
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
112+
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
113+
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
114+
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
115+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
93116
</component>
94117
</module>

‎app/build.gradle

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
6-
7-
defaultConfig {
8-
applicationId "com.nosfistis.mike.refene"
9-
minSdkVersion 15
10-
targetSdkVersion 23
11-
versionCode 3
12-
versionName "1.0"
13-
}
14-
buildTypes {
15-
release {
16-
minifyEnabled false
17-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18-
}
19-
}
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.0"
6+
7+
defaultConfig {
8+
applicationId "com.nosfistis.mike.refene"
9+
minSdkVersion 15
10+
targetSdkVersion 25
11+
versionCode 3
12+
versionName "1.0"
13+
}
14+
buildTypes {
15+
release {
16+
minifyEnabled false
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
19+
}
2020
}
2121

2222
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:23.1.1'
25-
compile 'com.android.support:recyclerview-v7:23.1.1'
26-
compile 'com.android.support:cardview-v7:23.1.1'
23+
compile fileTree(dir: 'libs', include: ['*.jar'])
24+
compile 'com.android.support:appcompat-v7:25.3.1'
25+
compile 'com.android.support:recyclerview-v7:25.3.1'
26+
compile 'com.android.support:cardview-v7:25.3.1'
2727
}

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Aug 04 11:51:37 EEST 2015
1+
#Mon May 01 01:02:28 EEST 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.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)