Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

Commit d92ed8c

Browse files
authored
Merge pull request #267 from CAAPIM/BuildScriptDependency
Update bintray and maven libraries
2 parents 98337e3 + 0c9b297 commit d92ed8c

File tree

7 files changed

+20
-21
lines changed

7 files changed

+20
-21
lines changed

build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@
77
*/
88

99
// Top-level build file where you can add configuration options common to all sub-projects/modules.
10-
println '---------> executing SecureMessaging build.gradle'
1110

1211
buildscript {
1312
repositories {
1413
jcenter()
1514
google()
1615
}
1716
dependencies {
18-
classpath 'com.android.tools.build:gradle:3.1.2'
19-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
20-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
17+
classpath 'com.android.tools.build:gradle:3.1.3'
18+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
19+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2'
2120
classpath 'com.google.gms:google-services:3.1.1'
2221
}
2322
}

mas-connecta/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest"
9595

9696
dependencies {
9797
implementation fileTree(dir: 'libs', include: ['*.jar'])
98-
implementation project(':mas-foundation')
99-
implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibsVersion"
98+
api project(':mas-foundation')
99+
api "com.android.support:appcompat-v7:$rootProject.ext.supportLibsVersion"
100100

101101
api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
102-
implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
102+
api 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
103103

104104
androidTestImplementation project(':mas-test')
105105
}

mas-foundation/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ dependencies {
6161

6262
implementation fileTree(include: ['*.jar'], dir: 'libs')
6363

64-
implementation "com.google.zxing:core:$rootProject.ext.zxingVersion"
64+
api "com.google.zxing:core:$rootProject.ext.zxingVersion"
6565
implementation "com.android.support:support-annotations:$rootProject.ext.supportLibsVersion"
66-
implementation "com.nimbusds:nimbus-jose-jwt:$rootProject.ext.nimbusJoseVersion"
66+
api "com.nimbusds:nimbus-jose-jwt:$rootProject.ext.nimbusJoseVersion"
6767

6868
//For Android API 16 and 17
6969
compileOnly "org.bouncycastle:bcpkix-jdk15on:$rootProject.ext.bcpVersion"

mas-identity-management/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest"
8181
dependencies {
8282

8383
implementation fileTree(dir: 'libs', include: ['*.jar'])
84-
implementation project(':mas-foundation')
84+
api project(':mas-foundation')
8585

8686
androidTestImplementation project(':mas-test')
8787

mas-storage/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest"
8282
dependencies {
8383
implementation fileTree(dir: 'libs', include: ['*.jar'])
8484

85-
implementation project(':mas-foundation')
85+
api project(':mas-foundation')
8686
implementation "com.android.support:support-annotations:$rootProject.ext.supportLibsVersion"
8787

8888
androidTestImplementation project(':mas-test')

mas/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ android {
2828

2929
dependencies {
3030

31-
implementation project(':mas-foundation')
32-
implementation project(':mas-connecta')
33-
implementation project(':mas-storage')
34-
implementation project(':mas-identity-management')
31+
api project(':mas-foundation')
32+
api project(':mas-connecta')
33+
api project(':mas-storage')
34+
api project(':mas-identity-management')
3535

3636
}
3737

masui/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ android {
3434

3535
dependencies {
3636
implementation fileTree(include: ['*.jar'], dir: 'libs')
37-
implementation project(':mas-foundation')
38-
implementation "com.android.support:support-annotations:$rootProject.ext.supportLibsVersion"
39-
implementation "com.android.support:design:$rootProject.ext.supportLibsVersion"
40-
implementation "com.android.support:gridlayout-v7:$rootProject.ext.supportLibsVersion"
41-
implementation "net.openid:appauth:$rootProject.ext.appAuthVersion"
42-
implementation "com.android.support:customtabs:$rootProject.ext.supportLibsVersion"
37+
api project(':mas-foundation')
38+
api "com.android.support:support-annotations:$rootProject.ext.supportLibsVersion"
39+
api "com.android.support:design:$rootProject.ext.supportLibsVersion"
40+
api "com.android.support:gridlayout-v7:$rootProject.ext.supportLibsVersion"
41+
api "net.openid:appauth:$rootProject.ext.appAuthVersion"
42+
api "com.android.support:customtabs:$rootProject.ext.supportLibsVersion"
4343
}
4444

4545
//jcenter integration

0 commit comments

Comments
 (0)