Commit 55bcb461 authored by Tobias Wich's avatar Tobias Wich
Browse files

Update libs and gradle and android to API 31

parent 6d5063f3
apply plugin: 'com.android.application'
android {
compileSdkVersion 30
compileSdkVersion 31
defaultConfig {
applicationId "ecsec.skid.demo"
minSdkVersion 17
targetSdkVersion 30
targetSdkVersion 31
versionCode 1
versionName "1.0.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......@@ -25,6 +25,7 @@ android {
// make sure the dex compiler translates all java 8 constructs to be compatible with older APIs
// https://developer.android.com/studio/write/java8-support
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility 1.8
targetCompatibility 1.8
}
......@@ -44,21 +45,23 @@ repositories {
def SkidVersion = "1.0.0-rc.4-SNAPSHOT"
dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
// the SkIDentity library
implementation(group: 'de.ecsec.skid.client', name: 'skid-lib-android', version: "${SkidVersion}")
// logging library, use whatever you like to output the slf4j log statements
implementation 'org.slf4j:slf4j-api:1.7.30'
implementation 'com.github.tony19:logback-android:1.3.0-2'
implementation 'com.github.tony19:logback-android:2.0.0'
}
......@@ -15,19 +15,20 @@
<activity
android:name=".activities.AuthenticationActivity"
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize"></activity>
android:configChanges="orientation|screenSize" />
<activity
android:name=".activities.CreateCloudIdActivity"
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize"></activity>
android:configChanges="orientation|screenSize" />
<activity
android:name=".activities.ManageCloudIdActivity"
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize"></activity>
android:configChanges="orientation|screenSize" />
<activity
android:name=".activities.UseCaseSelectorActivity"
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize">
android:configChanges="orientation|screenSize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
......@@ -52,7 +53,7 @@
<activity
android:name=".activities.PINManagementActivity"
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize"></activity>
android:configChanges="orientation|screenSize" />
</application>
</manifest>
\ No newline at end of file
......@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.1'
classpath 'com.android.tools.build:gradle:7.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
......
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
## For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#Tue Feb 01 18:52:01 CET 2022
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
android.enableJetifier=true
android.useAndroidX=true
#Fri Apr 16 14:47:42 CEST 2021
#Tue Feb 01 18:49:37 CET 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment