update Android dependencies

pull/160/head
Valeriy O 2019-07-03 12:24:49 -07:00
parent 56ede37963
commit 73b68c8a71
4 changed files with 22 additions and 16 deletions

View File

@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
compileSdkVersion 28
defaultConfig {
applicationId "com.wolfssl.wolfcrypt_ndk_gradle"
minSdkVersion 24
targetSdkVersion 25
minSdkVersion 23
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -29,7 +29,7 @@ android {
sourceSets {
// wolfSSL JNI Java source files are added here
main.java.srcDirs += 'src/main/../../../wolfcrypt-jni/src/main/java'
main.java.srcDirs += '../wolfcrypt-jni/src/main/java'
}
}
@ -38,7 +38,7 @@ dependencies {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:25.3.1'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
}

View File

@ -1,14 +1,17 @@
<?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="com.wolfssl.wolfcryptjni_ndk_gradle">
<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.wolfssl.wolfcryptjni_ndk_gradle.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

View File

@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
compileSdkVersion 28
defaultConfig {
applicationId "com.wolfssl.wolfssl_ndk_gradle"
minSdkVersion 24
targetSdkVersion 25
minSdkVersion 23
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -29,7 +29,7 @@ android {
sourceSets {
// wolfSSL JNI Java source files are added here
main.java.srcDirs += 'src/main/../../../wolfssljni/src/java'
main.java.srcDirs += '../wolfssljni/src/java'
}
}
@ -38,7 +38,7 @@ dependencies {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:25.3.1'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
}

View File

@ -1,14 +1,17 @@
<?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="com.wolfssl.wolfssljni_ndk_gradle">
<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.wolfssl.wolfssljni_ndk_gradle.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />