Skip to content

Commit 34b3593

Browse files
authored
Merge pull request #507 from AzureAD/release/0.0.10
Release/0.0.10 merge to master
2 parents 0838eef + 609e35a commit 34b3593

190 files changed

Lines changed: 18432 additions & 1768 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,19 @@ proguard/
3232
# Android Studio captures folder
3333
captures/
3434

35-
# Intellij
35+
# IntelliJ
3636
*.iml
3737
.idea/workspace.xml
3838
.idea/tasks.xml
3939
.idea/gradle.xml
40+
.idea/assetWizardSettings.xml
4041
.idea/dictionaries
4142
.idea/libraries
42-
.idea/vcs.xml
43+
.idea/caches
44+
# Android Studio 3 in .gitignore file.
45+
.idea/caches/build_file_checksums.ser
4346
.idea/modules.xml
44-
.idea/.name
47+
.idea/codeStyles/
4548

4649
# Keystore files
4750
# Uncomment the following line if you do not want to check your keystore files in.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android:
1010
- tools
1111

1212
# The BuildTools version used by the project
13-
- build-tools-27.0.3
13+
- build-tools-28.0.3
1414

1515
# The SDK version used to compile the project
1616
- android-27

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
65
google()
6+
jcenter()
77
}
88
dependencies {
99
classpath 'com.android.tools.build:gradle:3.1.3'
@@ -15,8 +15,8 @@ buildscript {
1515

1616
allprojects {
1717
repositories {
18-
jcenter()
1918
google()
19+
jcenter()
2020
}
2121
}
2222

changelog.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Version 0.0.10
2+
-------------
3+
- Adds support HTTP response caching
4+
- Bugfixes:
5+
* Pass claims in non-joined acquireTokenSilentCall
6+
* Fixes the assertion check for IntuneAppProtectionPolicyRequiredException
7+
8+
Version 0.0.10-alpha
9+
-------------
10+
- Adds support for declared non-tfp B2C authorities
11+
- Fix setting correct id token for B2C if v1 id token is returned
12+
- Fix incorrect parsing of not_before as Date
13+
- V2 Broker changes with MSAL (Alpha)
14+
115
Version 0.0.9
216
-------------
317
- Bugfix: Resolves COMMON/#379

common/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME")
1313
project.ext.vstsPassword = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
1414
android {
1515
compileSdkVersion 27
16-
buildToolsVersion '27.0.3'
16+
buildToolsVersion '28.0.3'
1717

1818
defaultConfig {
1919
minSdkVersion 16
@@ -28,9 +28,13 @@ android {
2828
buildTypes {
2929
debug {
3030
buildConfigField("String", "AZURE_AUTHENTICATOR_APP_SIGNATURE", "\"N1jdcbbnKDr0LaFZlqdhXgm2luE=\"")
31+
buildConfigField("String", "COMPANY_PORTAL_APP_SIGNATURE", "\"1wIqXSqBj7w+h11ZifsnqwgyKrY=\"")
32+
buildConfigField("String", "COMPANY_PORTAL_APP_PACKAGE_NAME", "\"com.microsoft.identity.testuserapp\"")
3133
}
3234
release {
3335
buildConfigField("String", "AZURE_AUTHENTICATOR_APP_SIGNATURE", "\"ho040S3ffZkmxqtQrSwpTVOn9r0=\"")
36+
buildConfigField("String", "COMPANY_PORTAL_APP_SIGNATURE", "\"1L4Z9FJCgn5c0VLhyAxC5O9LdlE=\"")
37+
buildConfigField("String", "COMPANY_PORTAL_APP_PACKAGE_NAME", "\"com.microsoft.windowsintune.companyportal\"")
3438
minifyEnabled false
3539
debuggable false
3640
testCoverageEnabled false
@@ -60,6 +64,7 @@ android {
6064
main {
6165
manifest.srcFile 'src/main/AndroidManifest.xml'
6266
java.srcDirs = ['src/main/java']
67+
res.srcDirs = ['src/main/res']
6368
}
6469
}
6570

@@ -250,9 +255,9 @@ afterEvaluate {
250255

251256
// Repositories from which Gradle can fetch dependencies
252257
repositories {
258+
google()
253259
mavenLocal()
254260
jcenter()
255-
google()
256261
maven {
257262
name "vsts-maven-adal-android"
258263
url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
@@ -265,6 +270,6 @@ repositories {
265270

266271
tasks.whenTaskAdded { task ->
267272
if (task.name == 'assembleDebug' || task.name == 'assembleRelease') {
268-
task.dependsOn 'lint', 'sourcesJar', 'checkstyle', 'pmd'
273+
task.dependsOn 'lint', 'sourcesJar', 'pmd'
269274
}
270275
}

0 commit comments

Comments
 (0)