Skip to content

Commit 2e5460c

Browse files
authored
Merging release branch to dev (#273)
* Update the version number for pre-release 0.1.2 as well as the changelog. (#250) * Update the changelog for #239 fix. (#256) * Revert the change on timeout APIs (#264) Revert the PR#248 and update the changelog. * Fix the build of test apps by disabling the testCoverageEnabled property. (#265) * Add RC build support (#255) * Add RC build support. (cherry picked from commit 92ca066) * Add publishNonDefault to true in build.gradle to build all non default builds( release build ) (#269) (cherry picked from commit 6fe0eae) * Change Log edits (#272)
1 parent 6fe0eae commit 2e5460c

File tree

5 files changed

+23
-99
lines changed

5 files changed

+23
-99
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Add to your app's Build.Gradle:
4343
mavenCentral()
4444
}
4545
dependencies {
46-
compile('com.microsoft.identity.client:msal:0.1.1') {
46+
compile('com.microsoft.identity.client:msal:0.1.2') {
4747
// if your app includes android support
4848
// libraries or GSON in its dependencies
4949
// uncomment below

changelog

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
2+
3+
Version 0.1.2
4+
----------------------------
5+
1. GDPR compliance to Telemetry and Logger. Link: https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki/Logging
6+
2. Fix the bug on CustomTabService checking when calling getCustomTabsServiceIsBound()
7+
3. Update Telemetry to track telemetry Event data in a single Map instance
8+
4. Specifies thrown Exception classes in AbstractMetadataRequestor
9+
5. Create "no-args" constructor for GSON POJOs to prevent using "sun.misc.Unsafe" 
10+
6. Specifies the default locale to UTF_8 to guarantee consistent behavior across all Android devices.
11+
7. Use versions.gradle to aggregate versions across subproject
12+
8. Update Gradle to 4.1
13+
9. Update Gson to 2.8.0
14+
15+
Version 0.1.1
16+
----------------------------
17+
* This release contains the preview for Microsoft Authentication library (MSAL) for Android.
18+
Re-tag to fix the dependencies pulling issue from jcenter.
19+
120
Version 0.1.0
221
----------------------------
322
* Initial preview release for MSAL

msal/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
minSdkVersion rootProject.ext.minSdkVersion
1515
targetSdkVersion rootProject.ext.targetSdkVersion
1616
versionCode 0
17-
versionName '0.1.1'
17+
versionName '0.1.2'
1818
project.archivesBaseName = "msal"
1919
project.version = android.defaultConfig.versionName
2020
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

msal/src/http/java/com/microsoft/identity/client/HttpRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ private HttpURLConnection setupConnection() throws IOException {
220220
urlConnection.setRequestProperty(entry.getKey(), entry.getValue());
221221
}
222222

223-
urlConnection.setConnectTimeout(MsalSettings.INSTANCE.getConnectTimeOut());
224-
urlConnection.setReadTimeout(MsalSettings.INSTANCE.getReadTimeOut());
223+
urlConnection.setConnectTimeout(CONNECT_TIME_OUT_MSEC);
224+
urlConnection.setReadTimeout(READ_TIME_OUT_MSEC);
225225
urlConnection.setInstanceFollowRedirects(true);
226226
urlConnection.setUseCaches(false);
227227
urlConnection.setDoInput(true);

msal/src/internal/java/com/microsoft/identity/client/MsalSettings.java

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)