Skip to content

Commit 16dd4d3

Browse files
velitasalivelitasali
committed
Fix issues & new coolsocket & update sdk
1 parent 6a47cad commit 16dd4d3

21 files changed

+1145
-1295
lines changed

‎CoolSocket-Client.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="CoolSocket-Client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="CoolSocket-Client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
@@ -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.78 MB
Binary file not shown.

‎app/app.iml‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="CoolSocket-Client" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -22,32 +22,40 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2626
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2727
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3031
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3334
<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" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
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" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4849
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4950
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5159
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5260
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -78,60 +86,51 @@
7886
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8293
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
84100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
85102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
87105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
88106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
89107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
90110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
91112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
92113
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
93114
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
94115
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
95116
</content>
96-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
117+
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
97118
<orderEntry type="sourceFolder" forTests="false" />
98-
<orderEntry type="library" exported="" name="http-request-6.0" level="project" />
99-
<orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
100-
<orderEntry type="library" exported="" name="design-25.3.1" level="project" />
101-
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
102-
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
103-
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
104-
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
105-
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
106-
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
107-
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
108-
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
109-
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
110-
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
111-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
112-
<orderEntry type="module" module-name="gdatabase" exported="" />
113-
<orderEntry type="library" exported="" name="support-annotations-25.0.1" level="project" />
114-
<orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
115-
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
116-
<orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
117-
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
118-
<orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
119-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
120-
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
121-
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
122-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
123-
<orderEntry type="library" exported="" name="support-compat-25.0.1" level="project" />
124-
<orderEntry type="library" exported="" name="support-fragment-25.0.1" level="project" />
125-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.0.1" level="project" />
126-
<orderEntry type="library" exported="" name="support-v4-25.0.1" level="project" />
127-
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
128-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
129-
<orderEntry type="library" exported="" name="support-core-ui-25.0.1" level="project" />
130-
<orderEntry type="library" exported="" name="support-media-compat-25.0.1" level="project" />
131-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
132-
<orderEntry type="library" exported="" name="support-vector-drawable-25.0.1" level="project" />
133-
<orderEntry type="library" exported="" name="appcompat-v7-25.0.1" level="project" />
134-
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
135-
<orderEntry type="library" exported="" name="support-core-utils-25.0.1" level="project" />
119+
<orderEntry type="library" name="com.android.support:recyclerview-v7-26.0.2" level="project" />
120+
<orderEntry type="library" name="com.android.support:support-media-compat-26.0.2" level="project" />
121+
<orderEntry type="library" name="com.android.support:support-vector-drawable-26.0.2" level="project" />
122+
<orderEntry type="library" name="com.android.support:support-v4-26.0.2" level="project" />
123+
<orderEntry type="library" name="com.android.support:support-fragment-26.0.2" level="project" />
124+
<orderEntry type="library" name="com.github.kevinsawicki:http-request:6.0@jar" level="project" />
125+
<orderEntry type="library" name="com.android.support:appcompat-v7-26.0.2" level="project" />
126+
<orderEntry type="library" name="com.android.support:animated-vector-drawable-26.0.2" level="project" />
127+
<orderEntry type="library" name="com.android.support:transition-26.0.2" level="project" />
128+
<orderEntry type="library" name="com.android.support:support-core-utils-26.0.2" level="project" />
129+
<orderEntry type="library" name="com.android.support:support-core-ui-26.0.2" level="project" />
130+
<orderEntry type="library" name="com.android.support:design-26.0.2" level="project" />
131+
<orderEntry type="library" name="com.android.support:support-compat-26.0.2" level="project" />
132+
<orderEntry type="library" name="com.android.support:support-annotations:26.0.2@jar" level="project" />
133+
<orderEntry type="module" module-name="gdatabase" />
134+
<orderEntry type="library" name="android-android-26" level="project" />
136135
</component>
137136
</module>

‎app/build.gradle‎

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

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '25.0.2'
4+
compileSdkVersion 26
5+
buildToolsVersion '26.0.2'
66

77
defaultConfig {
88
applicationId "com.genonbeta.CoolSocket.test"
99
minSdkVersion 14
10-
targetSdkVersion 25
11-
versionCode 13
12-
versionName "1.1.1"
10+
targetSdkVersion 26
11+
versionCode 12
12+
versionName "1.1.2"
1313
}
1414
buildTypes {
1515
release {
@@ -20,10 +20,10 @@ android {
2020
}
2121

2222
dependencies {
23-
compile 'com.android.support:design:25.3.1'
24-
compile 'com.android.support:appcompat-v7:25.3.1'
25-
compile 'com.android.support:support-v4:25.3.1'
26-
compile 'com.github.kevinsawicki:http-request:6+'
23+
compile 'com.android.support:design:26.0.2'
24+
compile 'com.android.support:appcompat-v7:26.0.2'
25+
compile 'com.android.support:support-v4:26.0.2'
26+
compile 'com.github.kevinsawicki:http-request:6.0'
2727
compile fileTree(include: ['*.jar'], dir: 'libs')
2828
compile project(':gdatabase')
2929
}

‎app/release/app-release.apk‎

1.83 MB
Binary file not shown.

‎app/release/output.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":12},"path":"app-release.apk","properties":{"packageId":"com.genonbeta.CoolSocket.test","split":"","minSdkVersion":"14"}}]

0 commit comments

Comments
 (0)