Skip to content

Commit 4f781b6

Browse files
abarisainabarisain
committed
Update build configuration
1 parent 0d6c37e commit 4f781b6

File tree

5 files changed

+30
-41
lines changed

5 files changed

+30
-41
lines changed

‎Sample_Project/sample/.idea/misc.xml

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

‎Sample_Project/sample/app/app.iml

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,58 +62,49 @@
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" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
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" />
8079
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8380
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8681
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
8882
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8983
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9184
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9385
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9586
</content>
96-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
87+
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
9788
<orderEntry type="sourceFolder" forTests="false" />
9889
<orderEntry type="library" exported="" name="play-services-base-9.6.1" level="project" />
9990
<orderEntry type="library" exported="" name="play-services-gass-9.6.1" level="project" />
91+
<orderEntry type="library" exported="" name="support-core-ui-26.0.0" level="project" />
92+
<orderEntry type="library" exported="" name="support-fragment-26.0.0" level="project" />
93+
<orderEntry type="library" exported="" name="animated-vector-drawable-26.0.0" level="project" />
10094
<orderEntry type="library" exported="" name="play-services-iid-9.6.1" level="project" />
95+
<orderEntry type="library" exported="" name="support-media-compat-26.0.0" level="project" />
96+
<orderEntry type="library" exported="" name="support-compat-26.0.0" level="project" />
10197
<orderEntry type="library" exported="" name="play-services-ads-9.6.1" level="project" />
98+
<orderEntry type="library" exported="" name="support-vector-drawable-26.0.0" level="project" />
99+
<orderEntry type="library" exported="" name="support-core-utils-26.0.0" level="project" />
102100
<orderEntry type="library" exported="" name="play-services-tasks-9.6.1" level="project" />
101+
<orderEntry type="library" exported="" name="support-v4-26.0.0" level="project" />
103102
<orderEntry type="library" exported="" name="play-services-basement-9.6.1" level="project" />
104-
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
103+
<orderEntry type="library" exported="" name="batch-sdk-1.9.2" level="project" />
105104
<orderEntry type="library" exported="" name="play-services-ads-lite-9.6.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" />
105+
<orderEntry type="library" exported="" name="support-annotations-26.0.0" level="project" />
106+
<orderEntry type="library" exported="" name="appcompat-v7-26.0.0" level="project" />
108107
<orderEntry type="library" exported="" name="play-services-clearcut-9.6.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="batch-sdk-1.8.0" level="project" />
113-
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
114-
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
115-
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
116-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
117108
<orderEntry type="library" exported="" name="play-services-gcm-9.6.1" level="project" />
118109
</component>
119110
</module>

‎Sample_Project/sample/app/build.gradle

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@
33
*/
44

55
repositories {
6-
mavenCentral()
7-
maven {
8-
url "http://maven.batch.com/release"
9-
}
6+
jcenter()
7+
google()
108
}
119

1210
apply plugin: 'com.android.application'
1311

1412
android {
15-
compileSdkVersion 25
16-
buildToolsVersion '25.0.3'
13+
compileSdkVersion 26
14+
buildToolsVersion '26.0.1'
1715

1816
defaultConfig {
1917
applicationId "com.batch.android.sample"
20-
minSdkVersion 10
21-
targetSdkVersion 25
18+
minSdkVersion 15
19+
targetSdkVersion 26
2220
versionCode 1
2321
versionName "1.0"
2422
}
@@ -32,8 +30,8 @@ android {
3230

3331
dependencies {
3432
compile fileTree(dir: 'libs', include: ['*.jar'])
35-
compile 'com.android.support:appcompat-v7:25.3.1'
36-
compile 'com.android.support:support-v4:25.3.1'
33+
compile 'com.android.support:appcompat-v7:26.0.0'
34+
compile 'com.android.support:support-v4:26.0.0'
3735
compile 'com.google.android.gms:play-services-base:9.6.1'
3836
compile 'com.google.android.gms:play-services-gcm:9.6.1'
3937
compile 'com.google.android.gms:play-services-ads:9.6.1'

‎Sample_Project/sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
jcenter()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:2.3.2'
12+
classpath 'com.android.tools.build:gradle:2.3.3'
1313

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

‎Sample_Project/sample/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

0 commit comments

Comments
 (0)