Skip to content

Commit

Permalink
SDK 9.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
msft-cofitz committed Mar 15, 2023
1 parent 6508e35 commit 5b32d79
Show file tree
Hide file tree
Showing 64 changed files with 1,782 additions and 198 deletions.
18 changes: 14 additions & 4 deletions BuildTool/bin/BuildToolCLI
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit

APP_NAME="BuildToolCLI"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and BUILD_TOOL_CLI_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -204,6 +208,12 @@ set -- \
com.microsoft.intune.mam.cli.MamifierMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
15 changes: 9 additions & 6 deletions BuildTool/bin/BuildToolCLI.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem BuildToolCLI startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%..

Expand All @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\lib\com.microsoft.intune.mam.build.cli.jar;%APP_HOME%\l

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable BUILD_TOOL_CLI_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%BUILD_TOOL_CLI_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%BUILD_TOOL_CLI_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
Binary file modified BuildTool/lib/com.microsoft.intune.mam.build.cli.jar
Binary file not shown.
Binary file modified BuildTool/lib/com.microsoft.intune.mam.build.core.jar
Binary file not shown.
Binary file modified BuildTool/lib/com.microsoft.intune.mam.rewrite.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 9.5.0
-------------
* Add MAMTrustedRootCertsManager and MAMCertTrustWebViewClient APIs for trusted root certificates support.
* Fix SecurityException in isolated processes on devices with API 27 or under.

Version 9.4.0
-------------
* Add new preview build plugin to support Android Gradle Plugin 8.0.
Expand Down
Binary file modified GradlePlugin/com.microsoft.intune.mam.build-preview.jar
Binary file not shown.
Binary file modified GradlePlugin/com.microsoft.intune.mam.build.jar
Binary file not shown.
Binary file modified Microsoft.Intune.MAM.SDK-javadoc.jar
Binary file not shown.
Binary file modified Microsoft.Intune.MAM.SDK.aar
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Microsoft Intune App SDK for Android

Version [9.4.0](https://github.com/msintuneappsdk/ms-intune-app-sdk-android/releases)
Version [9.5.0](https://github.com/msintuneappsdk/ms-intune-app-sdk-android/releases)

See [release notes](https://github.com/msintuneappsdk/ms-intune-app-sdk-android/releases) for more information. GitHub users can receive email notifications for new releases to this repo by clicking on **Releases only** from the "Watch" drop-down menu in the upper right-hand corner.

Expand Down
2 changes: 1 addition & 1 deletion docs/assets/navtree_data.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5b32d79

Please sign in to comment.