Android: Start to fix up android for CI (#419)
This commit is contained in:
parent
b2cbc8866d
commit
35ba01d696
|
|
@ -12,8 +12,8 @@ android {
|
||||||
applicationId = "org.nxemu"
|
applicationId = "org.nxemu"
|
||||||
minSdk = 28
|
minSdk = 28
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 1
|
versionCode = (project.findProperty("nxemuVersionCode") as String?)?.toInt() ?: 1
|
||||||
versionName = "0.1"
|
versionName = project.findProperty("nxemuVersionName") as String? ?: "0.1"
|
||||||
|
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters += "arm64-v8a"
|
abiFilters += "arm64-v8a"
|
||||||
|
|
@ -27,10 +27,22 @@ android {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val releaseKeystore = System.getenv("NXEMU_KEYSTORE_FILE")
|
||||||
|
signingConfigs {
|
||||||
|
if (releaseKeystore != null) {
|
||||||
|
create("release") {
|
||||||
|
storeFile = file(releaseKeystore)
|
||||||
|
storePassword = System.getenv("NXEMU_KEYSTORE_PASSWORD")
|
||||||
|
keyAlias = System.getenv("NXEMU_KEY_ALIAS")
|
||||||
|
keyPassword = System.getenv("NXEMU_KEY_PASSWORD")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
isMinifyEnabled = false
|
isMinifyEnabled = false
|
||||||
signingConfig = signingConfigs.getByName("debug")
|
signingConfig = signingConfigs.getByName(if (releaseKeystore != null) "release" else "debug")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ set VERSION=%VERSION_PREFIX%%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_REVISION%-%
|
||||||
|
|
||||||
echo %VERSION%
|
echo %VERSION%
|
||||||
echo GIT_DESCRIBE=%VERSION%>"%base_dir%\git.properties"
|
echo GIT_DESCRIBE=%VERSION%>"%base_dir%\git.properties"
|
||||||
|
echo GIT_BUILD_VERSION=%GIT_BUILD_VERSION%>>"%base_dir%\git.properties"
|
||||||
goto :EOF
|
goto :EOF
|
||||||
|
|
||||||
:process_version
|
:process_version
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ function Upload-FilesToWebsite {
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
$validExtensions = @('.zip')
|
$validExtensions = @('.zip', '.apk')
|
||||||
$files = Get-ChildItem -Path $Directory -File | Where-Object {
|
$files = Get-ChildItem -Path $Directory -File | Where-Object {
|
||||||
$validExtensions -contains $_.Extension.ToLower()
|
$validExtensions -contains $_.Extension.ToLower()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue