From 74e315b2c9ce46349458b458ea261198c08880c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=A4nge?= Date: Thu, 13 Oct 2022 14:58:38 +0200 Subject: [PATCH] Update dependencies and sdk version - add kotlin-android - add 'exported=true' to AndroidManifest.xml --- app/build.gradle | 17 +++++++++-------- app/src/main/AndroidManifest.xml | 5 ++++- build.gradle | 7 +++++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a2289a2..2c8f868 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' android { - compileSdkVersion 28 + compileSdkVersion 32 defaultConfig { applicationId "org.secuso.privacyfriendlycircuittraining" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 32 versionCode 2 versionName "1.1" } @@ -21,7 +22,7 @@ android { android.applicationVariants.all { variant -> variant.outputs.all { def appName = "pfa-circuit-training" - outputFileName = appName+"-${variant.name}-v${variant.versionName}.apk" + outputFileName = appName + "-${variant.name}-v${variant.versionName}.apk" } } @@ -31,13 +32,13 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.github.PhilJay:MPAndroidChart:v3.0.0-beta1' - implementation 'com.github.bumptech.glide:glide:4.9.0' + implementation 'com.github.bumptech.glide:glide:4.11.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 58ae91a..a531918 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,7 @@ android:theme="@style/AppTheme"> @@ -85,7 +86,9 @@ android:enabled="true" android:exported="true" /> - + diff --git a/build.gradle b/build.gradle index a4ad8f1..e1663dc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.7.10' + repositories { - jcenter() + mavenCentral() google() } dependencies { classpath 'com.android.tools.build:gradle:7.2.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +18,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() google() } }