Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding intune app SDK, gradle plugin to MSAL project and updated MSAL… #1684

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Adding intune app SDK, gradle plugin to MSAL project and updated MSAL… #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,21 @@ buildscript {
repositories {
google()
mavenCentral()
maven {
// msazure and aria are consumed via upstream sources of the AndroidADAL feed.
name "vsts-maven-adal-android"
url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
credentials {
username project.vstsUsername
password project.vstsMavenAccessToken
}
}
}

dependencies {
classpath "com.android.tools.build:gradle:$rootProject.ext.gradleVersion"
classpath "org.javassist:javassist:${rootProject.ext.javaAssistVersion}"
classpath "com.microsoft.intune.mam:android-build-plugin:${rootProject.ext.intuneAppSdkVersion}"
}
}

Expand Down
2 changes: 2 additions & 0 deletions gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ ext {
uiAutomatorVersion = "2.2.0"
mseberaApacheHttpClientVersion = "4.5.8"
msal4jVersion = "1.10.0"
intuneAppSdkVersion = "8.6.3"
javaAssistVersion = "3.27.0-GA"

// TODO: adal automation test app.
supportLibraryVersion = "27.1.+"
Expand Down
9 changes: 9 additions & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ pluginManagement {
google()
mavenCentral()
gradlePluginPortal()
maven {
// msazure and aria are consumed via upstream sources of the AndroidADAL feed.
name "vsts-maven-adal-android"
url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
credentials {
username vstsUsername
password vstsMavenAccessToken
}
}
}
}
include ':msal', ':common', ':keyvault', ':labapi', ':testutils', ':pop-benchmarker',
Expand Down
13 changes: 12 additions & 1 deletion testapps/testapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
* // THE SOFTWARE.
*/

apply plugin: 'com.android.application'

plugins {
id "com.android.application"
id "com.microsoft.intune.mam"
}

def msalVersion = "4.+"

Expand Down Expand Up @@ -108,7 +112,14 @@ dependencies {
implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
implementation "androidx.legacy:legacy-support-v4:$rootProject.ext.legacySupportV4Version"
implementation "com.google.android.material:material:$rootProject.ext.materialVersion"
implementation "com.microsoft.intune.mam:android-sdk:$rootProject.ext.intuneAppSdkVersion"

compileOnly "org.projectlombok:lombok:$rootProject.ext.lombokVersion"
annotationProcessor "org.projectlombok:lombok:$rootProject.ext.lombokVersion"
}

//https://docs.microsoft.com/en-us/mem/intune/developer/app-sdk-android
intunemam {
verify = true
incremental = true //Experimental
}
2 changes: 1 addition & 1 deletion testapps/testapp/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<application
android:networkSecurityConfig="@xml/network_security_config"
android:name="com.microsoft.identity.client.testapp.MsalSampleApp"
Copy link
Contributor

@iamgusain iamgusain Aug 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this change to the name?

android:name="com.microsoft.intune.mam.client.app.MAMApplication"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
Expand Down