Skip to content

Commit f620f6f

Browse files
authored
Merge pull request #181 from AzureAD/weij/fixPomDependency
move pom task under dependency to correctly generate dependency in pom
2 parents a7e70ef + 74f68be commit f620f6f

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

msal/build.gradle

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,25 @@ task sourcesJar(type: Jar) {
100100
destinationDir = reporting.file("$project.buildDir/outputs/jar/")
101101
}
102102

103+
dependencies {
104+
compile fileTree(dir: 'libs', include: ['*.jar'])
105+
compile 'com.android.support:appcompat-v7:25.1.0'
106+
compile 'com.android.support:customtabs:25.1.0'
107+
compile 'com.google.code.gson:gson:2.2.4'
108+
109+
// test dependencies
110+
testCompile 'junit:junit:4.12'
111+
testCompile 'org.mockito:mockito-core:1.10.19'
112+
113+
// instrumentation test dependencies
114+
androidTestCompile 'com.android.support.test:runner:0.5'
115+
// Set this dependency to use JUnit 4 rules
116+
androidTestCompile 'com.android.support.test:rules:0.5'
117+
androidTestCompile 'org.mockito:mockito-core:1.10.19'
118+
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
119+
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
120+
}
121+
103122
task createPom {
104123
pom {
105124
project {
@@ -138,25 +157,6 @@ task createPom {
138157
}.writeTo("${archivesBaseName}-${version}.pom")
139158
}
140159

141-
dependencies {
142-
compile fileTree(dir: 'libs', include: ['*.jar'])
143-
compile 'com.android.support:appcompat-v7:25.1.0'
144-
compile 'com.android.support:customtabs:25.1.0'
145-
compile 'com.google.code.gson:gson:2.2.4'
146-
147-
// test dependencies
148-
testCompile 'junit:junit:4.12'
149-
testCompile 'org.mockito:mockito-core:1.10.19'
150-
151-
// instrumentation test dependencies
152-
androidTestCompile 'com.android.support.test:runner:0.5'
153-
// Set this dependency to use JUnit 4 rules
154-
androidTestCompile 'com.android.support.test:rules:0.5'
155-
androidTestCompile 'org.mockito:mockito-core:1.10.19'
156-
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
157-
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
158-
}
159-
160160
def configDir = new File(buildscript.sourceFile.parentFile.parentFile, 'config')
161161
ext.checkstyleConfigDir = "$configDir/checkstyle"
162162

0 commit comments

Comments
 (0)