diff --git a/.github/scripts/android/build.ps1 b/.github/scripts/android/build.ps1 index e6a36532f..99a06ed0d 100644 --- a/.github/scripts/android/build.ps1 +++ b/.github/scripts/android/build.ps1 @@ -4,7 +4,7 @@ ) $rootPath = $env:GITHUB_WORKSPACE; -$androidPath = $($rootPath + "\src\Android\Android.csproj"); +$androidPath = $($rootPath + "/src/Android/Android.csproj"); Write-Output "########################################" Write-Output "##### Build $configuration Configuration" diff --git a/.github/scripts/android/clean-fdroid.ps1 b/.github/scripts/android/clean-fdroid.ps1 index 33fd3cde0..11b5f9b1f 100644 --- a/.github/scripts/android/clean-fdroid.ps1 +++ b/.github/scripts/android/clean-fdroid.ps1 @@ -1,9 +1,9 @@ $rootPath = $env:GITHUB_WORKSPACE; -$androidPath = $($rootPath + "\src\Android\Android.csproj"); -$appPath = $($rootPath + "\src\App\App.csproj"); +$androidPath = $($rootPath + "/src/Android/Android.csproj"); +$appPath = $($rootPath + "/src/App/App.csproj"); -$androidManifest = $($rootPath + "\src\Android\Properties\AndroidManifest.xml"); +$androidManifest = $($rootPath + "/src/Android/Properties/AndroidManifest.xml"); Write-Output "########################################" Write-Output "##### Clean Android and App" diff --git a/.github/scripts/android/decrypt-secrets.ps1 b/.github/scripts/android/decrypt-secrets.ps1 index 4e351b9d4..84fcc2b5a 100644 --- a/.github/scripts/android/decrypt-secrets.ps1 +++ b/.github/scripts/android/decrypt-secrets.ps1 @@ -1,15 +1,15 @@ $rootPath = $env:GITHUB_WORKSPACE; -$decryptSecretPath = $($rootPath + "\.github\scripts\decrypt-secret.ps1"); +$decryptSecretPath = $($rootPath + "/.github/scripts/decrypt-secret.ps1"); $appKeystorePlayFilename = "app_play-keystore.jks"; -$appKeystorePlayPath = $($rootPath + "\src\Android\$appKeystorePlayFilename"); +$appKeystorePlayPath = $($rootPath + "/src/Android/$appKeystorePlayFilename"); $appKeystoreUploadFilename = "app_upload-keystore.jks"; -$appKeystoreUploadPath = $($rootPath + "\src\Android\$appKeystoreUploadFilename"); +$appKeystoreUploadPath = $($rootPath + "/src/Android/$appKeystoreUploadFilename"); $appKeystoreFdroidFilename = "app_fdroid-keystore.jks"; -$appKeystoreFdroidPath = $($rootPath + "\src\Android\$appKeystoreFdroidFilename"); +$appKeystoreFdroidPath = $($rootPath + "/src/Android/$appKeystoreFdroidFilename"); $googleServicesFilename = "google-services.json"; -$googleServicesPath = $($rootPath + "\src\Android\$googleServicesFilename"); +$googleServicesPath = $($rootPath + "/src/Android/$googleServicesFilename"); Invoke-Expression ` "& `"$decryptSecretPath`" -filename $($appKeystorePlayFilename + ".gpg") -output $($appKeystorePlayPath)" diff --git a/.github/scripts/android/deploy-play.ps1 b/.github/scripts/android/deploy-play.ps1 index 57b5d9bc1..96a65ba8f 100644 --- a/.github/scripts/android/deploy-play.ps1 +++ b/.github/scripts/android/deploy-play.ps1 @@ -1,9 +1,9 @@ $rootPath = $env:GITHUB_WORKSPACE; $homePath = $env:HOME; -$publisherPath = $($rootPath + "\store\google\Publisher\bin\Release\netcoreapp2.0\Publisher.dll"); -$credsPath = $($homePath + "\secrets\play_creds.json"); -$aabPath = $($rootPath + "\com.x8bit.bitwarden.aab"); +$publisherPath = $($rootPath + "/store/google/Publisher/bin/Release/netcoreapp2.0/Publisher.dll"); +$credsPath = $($homePath + "/secrets/play_creds.json"); +$aabPath = $($rootPath + "/com.x8bit.bitwarden.aab"); $track = "alpha"; dotnet $publisherPath $credsPath $aabPath $track diff --git a/.github/scripts/android/increment-version.ps1 b/.github/scripts/android/increment-version.ps1 index aed614745..501c110b0 100644 --- a/.github/scripts/android/increment-version.ps1 +++ b/.github/scripts/android/increment-version.ps1 @@ -5,7 +5,7 @@ Write-Output "########################################" Write-Output "##### Setting Version Code $buildNumber" Write-Output "########################################" -$androidManifest = $($rootPath + "\src\Android\Properties\AndroidManifest.xml"); +$androidManifest = $($rootPath + "/src/Android/Properties/AndroidManifest.xml"); $xml=New-Object XML; $xml.Load($androidManifest); diff --git a/.github/scripts/android/sign-fdroid.ps1 b/.github/scripts/android/sign-fdroid.ps1 index 983e4583a..74077feb7 100644 --- a/.github/scripts/android/sign-fdroid.ps1 +++ b/.github/scripts/android/sign-fdroid.ps1 @@ -1,6 +1,6 @@ $rootPath = $env:GITHUB_WORKSPACE; -$androidPath = $($rootPath + "\src\Android\Android.csproj"); +$androidPath = $($rootPath + "/src/Android/Android.csproj"); $appKeystoreFdroidFilename = "app_fdroid-keystore.jks"; @@ -17,7 +17,7 @@ Write-Output "########################################" Write-Output "##### Copy FDroid apk to project root" Write-Output "########################################" -$signedApkPath = $($rootPath + "\src\Android\bin\FDroid\com.x8bit.bitwarden-Signed.apk"); -$signedApkDestPath = $($rootPath + "\com.x8bit.bitwarden-fdroid.apk"); +$signedApkPath = $($rootPath + "/src/Android/bin/FDroid/com.x8bit.bitwarden-Signed.apk"); +$signedApkDestPath = $($rootPath + "/com.x8bit.bitwarden-fdroid.apk"); Copy-Item $signedApkPath $signedApkDestPath diff --git a/.github/scripts/android/sign-play.ps1 b/.github/scripts/android/sign-play.ps1 index ea684e11c..9c1283cf1 100644 --- a/.github/scripts/android/sign-play.ps1 +++ b/.github/scripts/android/sign-play.ps1 @@ -1,6 +1,6 @@ $rootPath = $env:GITHUB_WORKSPACE; -$androidPath = $($rootPath + "\src\Android\Android.csproj"); +$androidPath = $($rootPath + "/src/Android/Android.csproj"); $appKeystorePlayFilename = "app_play-keystore.jks"; $appKeystoreUploadFilename = "app_upload-keystore.jks"; @@ -18,8 +18,8 @@ Write-Output "########################################" Write-Output "##### Copy Google Play Bundle to project root" Write-Output "########################################" -$signedAabPath = $($rootPath + "\src\Android\bin\Release\com.x8bit.bitwarden-Signed.aab"); -$signedAabDestPath = $($rootPath + "\com.x8bit.bitwarden.aab"); +$signedAabPath = $($rootPath + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.aab"); +$signedAabDestPath = $($rootPath + "/com.x8bit.bitwarden.aab"); Copy-Item $signedAabPath $signedAabDestPath @@ -36,7 +36,7 @@ Write-Output "########################################" Write-Output "##### Copy Release APK to project root" Write-Output "########################################" -$signedApkPath = $($rootPath + "\src\Android\bin\Release\com.x8bit.bitwarden-Signed.apk"); -$signedApkDestPath = $($rootPath + "\com.x8bit.bitwarden.apk"); +$signedApkPath = $($rootPath + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.apk"); +$signedApkDestPath = $($rootPath + "/com.x8bit.bitwarden.apk"); Copy-Item $signedApkPath $signedApkDestPath