Skip to content

Commit 8de5afa

Browse files
iakoviakov
committed
AS 2.0
1 parent 20b9878 commit 8de5afa

11 files changed

Lines changed: 110 additions & 57 deletions

‎as/.idea/encodings.xml‎

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

‎as/.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.

‎as/.idea/libraries/animated_vector_drawable_23_3_0.xml‎

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

as/.idea/libraries/appcompat_v7_23_1_1.xml renamed to as/.idea/libraries/appcompat_v7_23_3_0.xml

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

‎as/.idea/libraries/commons_io_2_4.xml‎

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

as/.idea/libraries/support_annotations_23_1_1.xml renamed to as/.idea/libraries/support_annotations_23_3_0.xml

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

as/.idea/libraries/support_v4_23_1_1.xml renamed to as/.idea/libraries/support_v4_23_3_0.xml

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

‎as/.idea/libraries/support_vector_drawable_23_3_0.xml‎

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

‎as/app/app.iml‎

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="release" />
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13-
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
14-
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1515
<afterSyncTasks>
16-
<task>generateReleaseSources</task>
16+
<task>generateDebugSources</task>
1717
</afterSyncTasks>
1818
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1919
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,30 +24,50 @@
2424
</facet>
2525
</component>
2626
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
27-
<output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
27+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/release" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
49+
<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" />
4457
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4558
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
4659
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
4760
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
4861
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
4962
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5063
<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" />
5171
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5272
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
5373
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -57,29 +77,29 @@
5777
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
5878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
5979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6081
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
61-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-proguard" />
6282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
63-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
64-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.3.0/jars" />
6687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
6788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
7089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
7492
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
7593
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
7694
</content>
7795
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
7896
<orderEntry type="sourceFolder" forTests="false" />
7997
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
80-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
81-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
82-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
98+
<orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
99+
<orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
100+
<orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
101+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
102+
<orderEntry type="library" exported="" name="appcompat-v7-23.3.0" level="project" />
83103
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
84104
</component>
85105
<component name="org.twodividedbyzero.idea.findbugs">

‎as/app/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ apply plugin: 'com.android.application'
22

33
android {
44
signingConfigs {
5-
trikGamepad {
6-
storeFile file('/home/me/Google Drive/trikset.com/TRIK-management/android-keystorage.jks')
5+
config {
6+
keyAlias 'gamepad'
7+
storeFile file('android-keystorage.jks')
78
}
89
}
9-
buildToolsVersion "23.0.1"
10+
buildToolsVersion "23.0.2"
1011
compileSdkVersion 23
1112
defaultConfig {
1213
applicationId "com.trik.gamepad"
@@ -17,9 +18,9 @@ android {
1718
buildTypes {
1819
release {
1920
minifyEnabled true
20-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
21+
//proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
2122
debuggable true
22-
signingConfig signingConfigs.trikGamepad
23+
signingConfig signingConfigs.config
2324
}
2425
}
2526
useLibrary 'org.apache.http.legacy'
@@ -29,8 +30,8 @@ android {
2930
}
3031

3132
dependencies {
32-
compile 'com.android.support:appcompat-v7:23.1.1'
33-
compile 'com.android.support:support-v4:23.1.1'
34-
compile 'com.android.support:support-annotations:23.1.1'
33+
compile 'com.android.support:appcompat-v7:23.3.0'
34+
compile 'com.android.support:support-v4:23.3.0'
35+
compile 'com.android.support:support-annotations:23.3.0'
3536
compile 'commons-io:commons-io:2.4'
3637
}

0 commit comments

Comments
 (0)