summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle.kts2
-rw-r--r--gradle.properties3
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--main/build.gradle.kts4
-rw-r--r--main/src/main/AndroidManifest.xml3
-rw-r--r--main/src/main/cpp/CMakeLists.txt2
-rw-r--r--main/src/skeleton/AndroidManifest.xml3
-rw-r--r--main/src/ui/AndroidManifest.xml3
-rw-r--r--remoteExample/build.gradle4
-rw-r--r--remoteExample/src/main/AndroidManifest.xml3
-rw-r--r--tlsexternalcertprovider/build.gradle4
-rw-r--r--tlsexternalcertprovider/src/main/AndroidManifest.xml3
12 files changed, 24 insertions, 12 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index b77de274..e80d091d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath("com.android.tools.build:gradle:7.3.1")
+ classpath("com.android.tools.build:gradle:8.0.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}
diff --git a/gradle.properties b/gradle.properties
index bb3d1bd9..2af7a640 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,3 +6,6 @@
android.enableJetifier=true
android.useAndroidX=true
android.enableUnitTestBinaryResources=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 007be88c..8b3d4701 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index ae06c637..c8d3a737 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -13,6 +13,10 @@ plugins {
}
android {
+ buildFeatures {
+ aidl = true
+ }
+ namespace = "de.blinkt.openvpn"
compileSdk = 33
// Also update runcoverity.sh
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index fd21400b..1afe859e 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.openvpn">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 3dc1370f..f40eaa4d 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.4.1)
+project("ics-openvpn")
# Git version string
include(GetGitRevisionDescription.cmake)
@@ -180,6 +181,7 @@ set(openvpn_srcs
src/openvpn/proxy.c
src/openvpn/ps.c
src/openvpn/push.c
+ src/openvpn/reflect_filter.c
src/openvpn/reliable.c
src/openvpn/route.c
src/openvpn/run_command.c
diff --git a/main/src/skeleton/AndroidManifest.xml b/main/src/skeleton/AndroidManifest.xml
index 02a91024..23b1c7d9 100644
--- a/main/src/skeleton/AndroidManifest.xml
+++ b/main/src/skeleton/AndroidManifest.xml
@@ -4,8 +4,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.openvpn">
+ xmlns:tools="http://schemas.android.com/tools">
<application tools:ignore="AllowBackup,GoogleAppIndexingWarning">
<activity
diff --git a/main/src/ui/AndroidManifest.xml b/main/src/ui/AndroidManifest.xml
index 21241f0a..2a296183 100644
--- a/main/src/ui/AndroidManifest.xml
+++ b/main/src/ui/AndroidManifest.xml
@@ -4,8 +4,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.openvpn">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-feature
android:name="android.software.leanback"
diff --git a/remoteExample/build.gradle b/remoteExample/build.gradle
index a6adbaaa..648a30bf 100644
--- a/remoteExample/build.gradle
+++ b/remoteExample/build.gradle
@@ -15,6 +15,10 @@ android {
versionCode 1
versionName "1.0"
}
+ namespace 'de.blinkt.openvpn.remote'
+ buildFeatures {
+ aidl true
+ }
}
dependencies {
diff --git a/remoteExample/src/main/AndroidManifest.xml b/remoteExample/src/main/AndroidManifest.xml
index c5b955f5..311afc12 100644
--- a/remoteExample/src/main/AndroidManifest.xml
+++ b/remoteExample/src/main/AndroidManifest.xml
@@ -4,8 +4,7 @@
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="de.blinkt.openvpn.remote" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/tlsexternalcertprovider/build.gradle b/tlsexternalcertprovider/build.gradle
index ddf7cafd..59930696 100644
--- a/tlsexternalcertprovider/build.gradle
+++ b/tlsexternalcertprovider/build.gradle
@@ -38,6 +38,10 @@ android {
lint {
abortOnError false
}
+ namespace 'de.blinkt.externalcertprovider'
+ buildFeatures {
+ aidl true
+ }
// This is just a demo package, don't care about it being perfect
}
diff --git a/tlsexternalcertprovider/src/main/AndroidManifest.xml b/tlsexternalcertprovider/src/main/AndroidManifest.xml
index 47e15ac5..c524c203 100644
--- a/tlsexternalcertprovider/src/main/AndroidManifest.xml
+++ b/tlsexternalcertprovider/src/main/AndroidManifest.xml
@@ -4,8 +4,7 @@
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.externalcertprovider">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<application