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

Release/3.1.4 #1668

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Release/3.1.4 #1668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06addf7
Fix version reference for ADAL
shoatman Dec 8, 2021
97a7e14
Update version for hotifx
shoatman Dec 8, 2021
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
4 changes: 2 additions & 2 deletions adal/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}\"")
}
}

Expand Down
2 changes: 1 addition & 1 deletion adal/versioning/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Wed Aug 01 15:24:11 PDT 2018
versionName=3.1.3
versionName=3.1.4
versionCode=1
3 changes: 0 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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