Skip to content

Commit 1e67079

Browse files
author
Antonis
committed
Fixed travis build issue
1 parent a7af8eb commit 1e67079

File tree

3 files changed

+25
-10
lines changed

3 files changed

+25
-10
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android:
1010
- tools # to get the new `repository-11.xml`
1111
- platform-tools
1212
- tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943)
13-
- build-tools-25.0.1
13+
- build-tools-25.0.3
1414
- android-22
1515
- android-25
1616
# Without these the build fails

Examples/restcomm-olympus/app/app.iml

+23-8
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6464
<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" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -121,14 +121,29 @@
121121
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
122122
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
123123
<orderEntry type="library" exported="" name="recyclerview-v7-25.4.0" level="project" />
124-
<orderEntry type="library" exported="" name="testfairy-android-sdk-1.5.4" level="project" />
125124
<orderEntry type="library" exported="" name="support-annotations-25.4.0" level="project" />
126125
<orderEntry type="library" exported="" name="appcompat-v7-25.4.0" level="project" />
127126
<orderEntry type="library" exported="" name="support-vector-drawable-25.4.0" level="project" />
128127
<orderEntry type="library" exported="" scope="TEST" name="android-async-http-1.4.9" level="project" />
129128
<orderEntry type="library" exported="" name="support-compat-25.4.0" level="project" />
130129
<orderEntry type="library" exported="" name="animated-vector-drawable-25.4.0" level="project" />
131130
<orderEntry type="library" exported="" name="libwebrtc-1.0.0-beta5-16765" level="project" />
131+
<orderEntry type="library" exported="" name="testfairy-android-sdk-1.5.5" level="project" />
132132
<orderEntry type="module" module-name="restcomm.android.sdk" exported="" />
133+
<orderEntry type="library" exported="" name="android-jain-sip-ri-1.2.293" level="project" />
134+
<orderEntry type="library" exported="" name="core-1.54.0.0" level="project" />
135+
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
136+
<orderEntry type="library" exported="" name="prov-1.54.0.0" level="project" />
137+
<orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
138+
<orderEntry type="library" exported="" name="pkix-1.54.0.0" level="project" />
139+
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
140+
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
141+
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
142+
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
143+
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
144+
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
145+
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
146+
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
147+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
133148
</component>
134149
</module>

Examples/restcomm-olympus/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ buildscript {
2323

2424
android {
2525
compileSdkVersion 25
26-
buildToolsVersion '25.0.1'
26+
buildToolsVersion '25.0.3'
2727

2828
dexOptions {
2929
jumboMode = true

0 commit comments

Comments
 (0)