From fed8435d0b1d18a81b89f0e39ef74fee40280846 Mon Sep 17 00:00:00 2001
From: Hampus Rosenquist <hamro777@student.liu.se>
Date: Thu, 27 Oct 2022 18:35:40 +0200
Subject: [PATCH] Upgrade dependency version and targetSDK
---
.../Android/app/build.gradle | 15 +++++++--------
.../Android/app/src/main/AndroidManifest.xml | 3 ++-
drip-android-observer-master/Android/build.gradle | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drip-android-observer-master/Android/app/build.gradle b/drip-android-observer-master/Android/app/build.gradle
index c8a4f82..af1ced4 100644
--- a/drip-android-observer-master/Android/app/build.gradle
+++ b/drip-android-observer-master/Android/app/build.gradle
@@ -10,12 +10,12 @@ android {
def versionMinor = 3
def versionPatch = 0
- compileSdkVersion 30
+ compileSdkVersion 33
defaultConfig {
applicationId "org.opendroneid.android"
minSdkVersion 26
- targetSdkVersion 30
+ targetSdkVersion 33
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -43,19 +43,18 @@ dependencies {
def support_version = "29.0.0"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'com.google.android.material:material:1.1.0'
+ implementation 'com.google.android.material:material:1.7.0'
implementation 'com.mikepenz:fastadapter:3.3.1'
implementation 'com.mikepenz:fastadapter-commons:3.2.8'
implementation 'com.android.support:recyclerview-v7:' + support_version
implementation 'com.android.support:appcompat-v7:' + support_version
implementation 'com.android.support:support-fragment:' + support_version
- implementation 'com.google.android.gms:play-services-maps:17.0.0'
- implementation 'com.google.android.gms:play-services-location:17.1.0'
+ implementation 'com.google.android.gms:play-services-location:21.0.0'
implementation 'org.osmdroid:osmdroid-android:6.1.14'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.69'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
diff --git a/drip-android-observer-master/Android/app/src/main/AndroidManifest.xml b/drip-android-observer-master/Android/app/src/main/AndroidManifest.xml
index b91392f..7202089 100644
--- a/drip-android-observer-master/Android/app/src/main/AndroidManifest.xml
+++ b/drip-android-observer-master/Android/app/src/main/AndroidManifest.xml
@@ -30,7 +30,8 @@
<activity
android:name=".app.DebugActivity"
- android:screenOrientation="portrait">
+ android:screenOrientation="portrait"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/drip-android-observer-master/Android/build.gradle b/drip-android-observer-master/Android/build.gradle
index 95a372b..55521f9 100644
--- a/drip-android-observer-master/Android/build.gradle
+++ b/drip-android-observer-master/Android/build.gradle
@@ -10,10 +10,10 @@ buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.3.0'
+ classpath 'com.android.tools.build:gradle:7.3.1'
// NOTE: Do not place your application dependencies here; they belong
@@ -24,7 +24,7 @@ buildscript {
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
maven { url 'https://jitpack.io' }
}
}
--
GitLab