Allow to build a UI variant with OpenVPN 2.x only

schwabe · May 17, 2023 · a688889 · a688889
1 parent d551053
commit a688889
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          target: [Ui, Skeleton]
+          target: [UiOvpn23, SkeletonOvpn2, UiOvpn2]
     name: "Release ${{ matrix.target }}"
     runs-on: ubuntu-latest
     steps:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.0.0")
+        classpath("com.android.tools.build:gradle:8.0.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -98,15 +98,27 @@ android {
             }
         }
     }
-    flavorDimensions += listOf("implementation")
+    flavorDimensions += listOf("implementation", "ovpnimpl")
 
     productFlavors {
         create("ui") {
             dimension = "implementation"
-            buildConfigField("boolean", "openvpn3", "true")
         }
+
         create("skeleton") {
             dimension = "implementation"
+        }
+
+        create("ovpn23")
+        {
+            dimension = "ovpnimpl"
+            buildConfigField("boolean", "openvpn3", "true")
+        }
+
+        create("ovpn2")
+        {
+            dimension = "ovpnimpl"
+            versionNameSuffix = "-o2"
             buildConfigField("boolean", "openvpn3", "false")
         }
     }

diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java
@@ -31,6 +31,7 @@
 
 import com.android.vending.billing.IInAppBillingService;
 
+import de.blinkt.openvpn.BuildConfig;
 import de.blinkt.openvpn.core.NativeUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -86,7 +87,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         TextView osslVer = v.findViewById(R.id.openssl_version);
 
         verO2.setText(String.format(Locale.US, "OpenVPN version: %s", NativeUtils.getOpenVPN2GitVersion()));
-        verO3.setText(String.format(Locale.US, "OpenVPN3 core version: %s", NativeUtils.getOpenVPN3GitVersion()));
+        if (BuildConfig.openvpn3)
+            verO3.setText(String.format(Locale.US, "OpenVPN3 core version: %s", NativeUtils.getOpenVPN3GitVersion()));
+        else
+            verO3.setText("(OpenVPN 2.x only build. No OpenVPN 3.x core in this app)");
+
+
         osslVer.setText(String.format(Locale.US, "OpenSSL version: %s", NativeUtils.getOpenSSLVersion()));