Rename "standard" flavor to "ose"rename-standard-to-ose

12 files changed, 2 insertions, 20 deletions

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index abd61909..6138883c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,5 +35,5 @@ jobs:
         uses: softprops/action-gh-release@v0.1.14
         with:
           prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
-          files: app/build/outputs/apk/standard/release/*.apk
+          files: app/build/outputs/apk/ose/release/*.apk
           fail_on_unmatched_files: true
diff --git a/app/build.gradle b/app/build.gradle
index 4df79136..5c5aa82c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,7 @@ android {
 
     flavorDimensions "distribution"
     productFlavors {
-        standard {
+        ose {
             versionNameSuffix "-ose"
         }
     }
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/OkhttpClientTest.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/OkhttpClientTest.kt
index cbcb6906..cbcb6906 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/OkhttpClientTest.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/OkhttpClientTest.kt
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt
index bda06c6d..bda06c6d 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/LocalTestCollection.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/LocalTestCollection.kt
index 26b5ae9a..26b5ae9a 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/LocalTestCollection.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/LocalTestCollection.kt
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/LocalTestResource.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/LocalTestResource.kt
index 0f1f9cf2..0f1f9cf2 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/LocalTestResource.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/LocalTestResource.kt
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterServiceTest.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncAdapterServiceTest.kt
index de1ebc17..de1ebc17 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterServiceTest.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncAdapterServiceTest.kt
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt
index a4a7f03b..a4a7f03b 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt
index b494110c..b494110c 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt
index 6e664bed..6e664bed 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt
diff --git a/app/src/standard/java/at/bitfire/davdroid/OseFlavorModule.kt b/app/src/ose/java/at/bitfire/davdroid/OseFlavorModule.kt
index 9471e04f..9471e04f 100644
--- a/app/src/standard/java/at/bitfire/davdroid/OseFlavorModule.kt
+++ b/app/src/ose/java/at/bitfire/davdroid/OseFlavorModule.kt
diff --git a/run-tests.sh b/run-tests.sh
deleted file mode 100755
index 511c5926..00000000
--- a/run-tests.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-./gradlew -i --continue check mergeAndroidReports
-
-echo
-echo View lint report:
-echo -n file://
-realpath app/build/outputs/lint-results-gplayDebug.html
-
-echo
-echo View local unit test reports:
-echo -n file://
-realpath app/build/reports/tests/testStandardReleaseUnitTest/standardRelease/index.html
-
-echo
-echo "View merged Android test reports (debug):"
-echo -n file://
-realpath build/reports/androidTests/index.html