diff options
author | Ricki Hirner <hirner@bitfire.at> | 2022-08-31 18:12:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-31 18:12:25 +0300 |
commit | ee993a8557c3dd5bfccc52f55b5b2c8f03f3d343 (patch) | |
tree | 02074806a5aa15893a61856541593d097a7af063 | |
parent | 03deb4191a78ca0865f8bba6f224a71c0242bf1b (diff) |
Rename "standard" flavor to "ose"
-rw-r--r-- | .github/workflows/release.yml | 2 | ||||
-rw-r--r-- | app/build.gradle | 2 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/OkhttpClientTest.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/OkhttpClientTest.kt) | 0 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt) | 0 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/LocalTestCollection.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/LocalTestCollection.kt) | 0 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/LocalTestResource.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/LocalTestResource.kt) | 0 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncAdapterServiceTest.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterServiceTest.kt) | 0 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt) | 0 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt) | 0 | ||||
-rw-r--r-- | app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt (renamed from app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt) | 0 | ||||
-rw-r--r-- | app/src/ose/java/at/bitfire/davdroid/OseFlavorModule.kt (renamed from app/src/standard/java/at/bitfire/davdroid/OseFlavorModule.kt) | 0 | ||||
-rwxr-xr-x | run-tests.sh | 18 |
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 337f225e..f521ce01 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 |