Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2025-01-08 20:08:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix buildDir deprecation"

Browse Source 
This reverts commit 92477d5f19.
This commit is contained in:
Adam Velebil 2024-03-05 14:16:59 +01:00
parent 6516a579e0
commit df34745a2d
No known key found for this signature in database
GPG Key ID: C9B1E4A3CBBD2E10
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/app/collect_licenses.gradle
View File

@ -85,8 +85,7 @@ def collectLicenses(File rootDir, File ossPluginResDir, File outDir) {
tasks.register('collectLicenses') {
dependsOn(":app:releaseOssLicensesTask")
doLast {
def ossPluginResDir = new File(layout.buildDirectory.get().asFile, "generated/third_party_licenses/release/res/raw/")
def flutterAssetsDir = new File(project.rootDir.parent, "assets/licenses/raw/")
collectLicenses(project.rootDir, ossPluginResDir, flutterAssetsDir)
def ossPluginResDir = new File(project.buildDir, "generated/third_party_licenses/release/res/raw/")
collectLicenses(project.rootDir, ossPluginResDir, new File(project.rootDir.parent, "assets/licenses/raw/"))
}
}

4
android/app/signing.gradle
View File

@ -19,8 +19,8 @@ export YUBIOATH_KEY_PASSWORD=...
def keystoreData = System.getenv('YUBIOATH_STORE_BASE64')
if (keystoreData) {
file("${layout.buildDirectory}/keystore").mkdirs()
def keystore = file("${layout.buildDirectory}/keystore/yubioath-android.jks")
file("$buildDir/keystore").mkdirs()
def keystore = file("$buildDir/keystore/yubioath-android.jks")
keystore.delete()
keystore << keystoreData.decodeBase64()

6
android/build.gradle
View File

@ -15,14 +15,14 @@ allprojects {
}
}
rootProject.layout.buildDirectory = '../build'
rootProject.buildDir = '../build'
subprojects {
project.layout.buildDirectory = "${rootProject.layout.buildDirectory}/${project.name}"
project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app')
}
tasks.register("clean", Delete) {
delete rootProject.layout.buildDirectory
delete rootProject.buildDir
}