diff options
Diffstat (limited to 'tlsexternalcertprovider')
3 files changed, 17 insertions, 49 deletions
diff --git a/tlsexternalcertprovider/build.gradle b/tlsexternalcertprovider/build.gradle index ddf7cafd..bb50eb03 100644 --- a/tlsexternalcertprovider/build.gradle +++ b/tlsexternalcertprovider/build.gradle @@ -3,20 +3,17 @@ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ -apply plugin: 'com.android.application' - -ext { - bouncycastleVersion = '1.49' +plugins { + alias libs.plugins.android.application } android { - compileSdkVersion 27 - + compileSdkVersion 34 defaultConfig { applicationId "de.blinkt.externalcertprovider" - minSdkVersion 16 - targetSdkVersion 27 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" @@ -38,6 +35,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 } @@ -45,12 +46,12 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation ( - //'org.bouncycastle:bcprov-jdk15on:' + bouncycastleVersion, - //'org.bouncycastle:bcprov-ext-jdk15on:' + bouncycastleVersion, - //'org.bouncycastle:bcpkix-jdk15on:' + bouncycastleVersion, - 'org.bouncycastle:bcmail-jdk15on:' + bouncycastleVersion, - //'org.bouncycastle:bcpg-jdk15on:' + bouncycastleVersion +// libs.org.bouncycastle.bcprov.jdk15on, +// libs.org.bouncycastle.bcprov.ext.jdk15on, +// libs.org.bouncycastle.bcpkix.jdk15on, + libs.org.bouncycastle.bcmail.jdk15on, +// libs.org.bouncycastle.bcpg.jdk15on, ) - testImplementation 'junit:junit:4.12' + testImplementation(libs.junit) } diff --git a/tlsexternalcertprovider/src/androidTest/java/de/blinkt/externalcertprovider/ExampleInstrumentedTest.java b/tlsexternalcertprovider/src/androidTest/java/de/blinkt/externalcertprovider/ExampleInstrumentedTest.java deleted file mode 100644 index 8d3a21f1..00000000 --- a/tlsexternalcertprovider/src/androidTest/java/de/blinkt/externalcertprovider/ExampleInstrumentedTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2012-2018 Arne Schwabe - * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt - */ - -package de.blinkt.externalcertprovider; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("de.blinkt.externalcertprovider", appContext.getPackageName()); - } -} diff --git a/tlsexternalcertprovider/src/main/AndroidManifest.xml b/tlsexternalcertprovider/src/main/AndroidManifest.xml index 47e15ac5..79b065e6 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 @@ -33,8 +32,7 @@ </activity> - <service android:name=".ExternalCertService" - tools:ignore="ExportedService"> + <service android:name=".ExternalCertService" android:exported="true"> <intent-filter> <action android:name="de.blinkt.openvpn.api.ExternalCertificateProvider"/> </intent-filter> |