Skip to content

Commit bccf0a2

Browse files
committed
nits
1 parent 20b462c commit bccf0a2

6 files changed

Lines changed: 1 addition & 22 deletions

File tree

common/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ android {
116116
dist {
117117
dimension "main"
118118
}
119-
production{
120-
dimension "main"
121-
matchingFallbacks = ['dist']
122-
}
123119
}
124120

125121
sourceSets {
@@ -256,7 +252,6 @@ android.libraryVariants.all { variant ->
256252

257253
tasks.register('sourcesJar', Jar) {
258254
from android.sourceSets.main.java.srcDirs
259-
// classifier 'sources'
260255
archiveClassifier.set('sources')
261256
destinationDirectory = reporting.file("$project.buildDir/outputs/jar/")
262257
}
@@ -305,8 +300,6 @@ afterEvaluate {
305300
publications {
306301
distRelease(MavenPublication) {
307302
from components.distRelease
308-
println "Components1: ${components.distRelease}"
309-
println "pname: ${project.name}"
310303
groupId 'com.microsoft.identity'
311304
artifactId 'common'
312305
//Edit the 'version' here for VSTS RC build
@@ -343,16 +336,11 @@ afterEvaluate {
343336
}
344337
distDebug(MavenPublication) {
345338
from components.distDebug
346-
println "Components2: ${components.distDebug}"
347-
println "pname: ${project.name}"
348-
349-
// withoutComponent()
350339
groupId 'com.microsoft.identity'
351340
artifactId 'common-debug'
352341
//Edit the 'version' here for VSTS RC build
353342

354343
version = project.version
355-
// artifact{"$buildDir/outputs/aar/common-debug-${project.version}.aar"}
356344
}
357345
}
358346

@@ -406,7 +394,6 @@ tasks.withType(GenerateMavenPom).all {
406394
} else if (name.contains("distRelease")) {
407395
destination = layout.buildDirectory.file("poms/common-${project.version}.pom").get().asFile
408396
}
409-
// destination = layout.buildDirectory.file("poms/${project.name}-${project.version}.pom").get().asFile
410397
}
411398

412399
def dependenciesSizeInMb = project.hasProperty("dependenciesSizeMb") ? project.dependenciesSizeMb : "15"

common/src/main/java/com/microsoft/identity/common/internal/broker/MicrosoftAuthClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker.BROKER_ACTIVITY_NAME;
4141
import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker.BROKER_PACKAGE_NAME;
42-
//import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.BrokerContentProvider.API.MSAL_HELLO;
4342
import static com.microsoft.identity.common.exception.BrokerCommunicationException.Category.OPERATION_NOT_SUPPORTED_ON_CLIENT_SIDE;
4443
import static com.microsoft.identity.common.internal.broker.ipc.IIpcStrategy.Type.BOUND_SERVICE;
4544

common/src/main/java/com/microsoft/identity/common/sharedwithoneauth/OneAuthSharedFunctions.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@ package com.microsoft.identity.common.sharedwithoneauth
2424

2525
import android.content.Context
2626
import androidx.annotation.WorkerThread
27-
2827
import android.os.IInterface
29-
30-
3128
import com.microsoft.identity.common.components.AndroidPlatformComponentsFactory
32-
import com.microsoft.identity.common.internal.broker.BoundServiceClient
3329
import com.microsoft.identity.common.internal.broker.MicrosoftAuthClient
3430
import com.microsoft.identity.common.internal.broker.ipc.AccountManagerAddAccountStrategy
3531
import com.microsoft.identity.common.internal.broker.ipc.BoundServiceStrategy
@@ -86,8 +82,8 @@ class OneAuthSharedFunctions {
8682
sb.append("ContentProviderStrategy, ")
8783
strategies.add(contentProviderStrategy)
8884
}
89-
val boundServiceStrategy = BoundServiceStrategy(MicrosoftAuthClient(context))
9085

86+
val boundServiceStrategy = BoundServiceStrategy(MicrosoftAuthClient(context))
9187
if (boundServiceStrategy.isSupportedByTargetedBroker(activeBrokerPackageName)) {
9288
sb.append("BoundServiceStrategy, ")
9389
strategies.add(boundServiceStrategy)

common4j/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ task sourcesJar(type: Jar) {
7171
task generateJavadoc(type: Javadoc) {
7272
dependsOn generateBuildConfig
7373
failOnError false
74-
dependsOn
7574
title = "Microsoft Identity Common Java"
7675
source = sourceSets.main.java
7776
classpath += project.sourceSets.main.compileClasspath

testutils/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ android {
101101

102102
task sourcesJar(type: Jar) {
103103
from android.sourceSets.main.java.srcDirs
104-
// classifier 'sources'
105104
archiveClassifier.set('sources')
106105
}
107106

uiautomationutilities/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ android {
150150

151151
task sourcesJar(type: Jar) {
152152
from android.sourceSets.main.java.srcDirs
153-
// classifier 'sources'
154153
archiveClassifier.set('sources')
155154
}
156155

0 commit comments

Comments
 (0)