From 924402f84dda096fd3c0b3ca808948e4afcfe1d1 Mon Sep 17 00:00:00 2001
From: Norbel Ambanumben <aanorbel@gmail.com>
Date: Sat, 18 Nov 2023 14:03:00 +0100
Subject: [PATCH] Updated build files

---
 .github/workflows/archive.yml  |  2 +-
 .github/workflows/build.yml    |  4 ++--
 .github/workflows/emulator.yml |  2 +-
 .github/workflows/test.yml     |  2 +-
 shared-test/build.gradle       | 11 +++++++----
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml
index 40344f610..751317963 100644
--- a/.github/workflows/archive.yml
+++ b/.github/workflows/archive.yml
@@ -11,7 +11,7 @@ jobs:
           distribution: 'temurin'
       - name: checkout
         uses: actions/checkout@v2
-      - run: ./gradlew clean assembleDevFullRelease
+      - run: ./gradlew clean assembleOoniDevFullRelease
       - name: uploads dev apk
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46f49645d..06cafd070 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       matrix:
         version:
-            - "StableFullRelease"
-            - "StableFdroidRelease"
+            - "OoniStableFullRelease"
+            - "OoniStableFdroidRelease"
     steps:
     - uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/emulator.yml b/.github/workflows/emulator.yml
index de92c9393..3831ec073 100644
--- a/.github/workflows/emulator.yml
+++ b/.github/workflows/emulator.yml
@@ -29,7 +29,7 @@ jobs:
         arch: x86_64
         profile: Nexus 6
         ram-size: 2048M
-        script: ./gradlew connectedStableFullDebugAndroidTest
+        script: ./gradlew connectedOoniStableFullDebugAndroidTest
     - name: uploads test results
       uses: actions/upload-artifact@v2
       if: failure()
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f743fca58..7a6c25e48 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
           distribution: 'temurin'
       - name: checkout
         uses: actions/checkout@v2
-      - run: ./gradlew testStableFullRelease
+      - run: ./gradlew testOoniStableFullRelease
       - name: uploads test results
         uses: actions/upload-artifact@v2
         if: failure()
diff --git a/shared-test/build.gradle b/shared-test/build.gradle
index 5860f39d3..9d5c743af 100644
--- a/shared-test/build.gradle
+++ b/shared-test/build.gradle
@@ -18,8 +18,14 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17
     }
-    flavorDimensions = ['testing', 'license']
+    flavorDimensions = ['provider', 'testing', 'license']
     productFlavors {
+        ooni {
+            dimension 'provider'
+        }
+        dw {
+            dimension 'provider'
+        }
         stable {
             dimension 'testing'
         }
@@ -36,9 +42,6 @@ android {
         full {
             dimension 'license'
         }
-        dw {
-            dimension 'testing'
-        }
     }
 }