Skip to content

Commit 5df51e4

Browse files
author
husnjak
committed
Updated gradle
Tests are passing
1 parent 0d63656 commit 5df51e4

File tree

12 files changed

+308
-156
lines changed

12 files changed

+308
-156
lines changed

‎.gradle/4.4/fileContent/fileContent.lock

17 Bytes
Binary file not shown.

‎.gradle/4.4/fileHashes/fileHashes.lock

0 Bytes
Binary file not shown.

‎.gradle/4.4/javaCompile/javaCompile.lock

17 Bytes
Binary file not shown.

‎.gradle/4.4/taskHistory/taskHistory.lock

0 Bytes
Binary file not shown.

‎.gradle/buildOutputCleanup/buildOutputCleanup.lock

0 Bytes
Binary file not shown.

‎.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎.idea/workspace.xml

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

‎app/app.iml

+22-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
</configuration>
2424
</facet>
2525
<facet type="kotlin-language" name="Kotlin">
26-
<configuration version="3" platform="JVM 1.6" useProjectSettings="false">
26+
<configuration version="3" platform="JVM 1.8" useProjectSettings="false">
2727
<compilerSettings />
2828
<compilerArguments>
2929
<option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
3030
<option name="noStdlib" value="true" />
3131
<option name="noReflect" value="true" />
3232
<option name="moduleName" value="app_debug" />
33+
<option name="jvmTarget" value="1.8" />
3334
<option name="addCompilerBuiltIns" value="true" />
3435
<option name="loadBuiltInsFromDependencies" value="true" />
3536
<option name="languageVersion" value="1.2" />
@@ -106,26 +107,44 @@
106107
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
107108
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
108109
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
109112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
110113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
111114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
112115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
116+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
117+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/extractedTypedefs" />
113118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
119+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
120+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
121+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
122+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
114123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
115124
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
116125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
126+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
127+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
117128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
118129
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
130+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/publish-proguard" />
119131
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
120132
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
133+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
134+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
121135
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
136+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
137+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
138+
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
122139
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
140+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
123141
</content>
124142
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
125143
<orderEntry type="sourceFolder" forTests="false" />
126144
<orderEntry type="library" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
127145
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
128146
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
147+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.61@jar" level="project" />
129148
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
130149
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
131150
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
@@ -142,17 +161,16 @@
142161
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
143162
<orderEntry type="library" name="Gradle: junit:junit:4.12@jar" level="project" />
144163
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
164+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.61@jar" level="project" />
145165
<orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
146166
<orderEntry type="library" name="Gradle: com.android.support.test:monitor-1.0.2" level="project" />
147167
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
148168
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.1" level="project" />
149-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.60@jar" level="project" />
150169
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
151170
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
152171
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
153-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60@jar" level="project" />
154172
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
155-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.60@jar" level="project" />
173+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.61@jar" level="project" />
156174
<orderEntry type="library" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
157175
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
158176
</component>

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
minSdkVersion 21
99
targetSdkVersion 27
1010
versionCode 1
11-
versionName "1.1.1"
11+
versionName "1.3.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {

‎app/src/androidTest/java/com/igdb/api_android_java/test/IGDBWrapperTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public void onError(VolleyError error) {
266266
public void feeds() throws Exception {
267267
setUp();
268268
Parameters parameters = new Parameters()
269-
.addIds("4011");
269+
.addIds("273556");
270270

271271
final CountDownLatch lock = new CountDownLatch(1);
272272
wrapper.feeds(parameters, new OnSuccessCallback() {
@@ -277,7 +277,7 @@ public void onSuccess(JSONArray result) {
277277
lock.countDown();
278278
jo = result.getJSONObject(0);
279279
String s = jo.getString("pulse");
280-
assertThat(s, is("24221"));
280+
assertThat(s, is("667496"));
281281
} catch (JSONException e) {
282282
e.printStackTrace();
283283
fail();

‎app/src/main/res/values/styles.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
4+
<style name="AppTheme" ><!--parent="Theme.AppCompat.Light.DarkActionBar"> -->
55
<!-- Customize your theme here. -->
66
<item name="colorPrimary">@color/colorPrimary</item>
77
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

‎build.gradle

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.60'
4+
ext.kotlin_version = '1.2.61'
55
repositories {
66
jcenter()
77
maven {
@@ -21,10 +21,7 @@ buildscript {
2121
allprojects {
2222
repositories {
2323
jcenter()
24-
maven {
25-
url 'https://maven.google.com/'
26-
name 'Google'
27-
}
24+
google()
2825
}
2926
}
3027

0 commit comments

Comments
 (0)