From 06addf7e9337bc5d06c3673694ae7e46f59ef567 Mon Sep 17 00:00:00 2001 From: "Shane Oatman (HE/HIM)" Date: Wed, 8 Dec 2021 10:08:59 -0800 Subject: [PATCH 1/2] Fix version reference for ADAL --- adal/build.gradle | 4 ++-- gradle.properties | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 17c1e1120..d3bd2ed81 100644 --- a/adal/build.gradle +++ b/adal/build.gradle @@ -55,13 +55,13 @@ android { debug { testCoverageEnabled false debuggable true - buildConfigField("String", "VERSION_NAME", "\"${versionName}\"") + buildConfigField("String", "VERSION_NAME", "\"${project.version}\"") } release { minifyEnabled false debuggable false proguardFiles getDefaultProguardFile('proguard-android.txt') - buildConfigField("String", "VERSION_NAME", "\"${versionName}\"") + buildConfigField("String", "VERSION_NAME", "\"${project.version}\"") } } diff --git a/gradle.properties b/gradle.properties index 4c56d3823..7aff4b6c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,5 @@ org.gradle.daemon=true # See https://stackoverflow.com/questions/56075455/expiring-daemon-because-jvm-heap-space-is-exhausted org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -Dkotlin.daemon.jvm.options\="-Xmx2048M" -XX:ReservedCodeCacheSize=512m -# This the TSL versionName... -versionName=1.5.9 - # For OneAuth default abiSelection abiSelection=x86_64 \ No newline at end of file From 97a7e14d32a905dff2e214fa2cfb761ac5a68330 Mon Sep 17 00:00:00 2001 From: "Shane Oatman (HE/HIM)" Date: Wed, 8 Dec 2021 10:10:44 -0800 Subject: [PATCH 2/2] Update version for hotifx --- adal/versioning/version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties index 4dfd5a96a..de9d16d2e 100644 --- a/adal/versioning/version.properties +++ b/adal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=3.1.3 +versionName=3.1.4 versionCode=1