From dfec7728e9018fe1d0d4e846dcefb11a8548ca7f Mon Sep 17 00:00:00 2001
From: Hampus Rosenquist <hamro777@student.liu.se>
Date: Mon, 10 Oct 2022 19:45:17 +0200
Subject: [PATCH] Upgrade gradle version
---
drip-android-observer-master/Android/app/build.gradle | 2 +-
.../Android/app/src/main/AndroidManifest.xml | 3 +--
drip-android-observer-master/Android/build.gradle | 2 +-
.../Android/gradle/wrapper/gradle-wrapper.properties | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drip-android-observer-master/Android/app/build.gradle b/drip-android-observer-master/Android/app/build.gradle
index c11cf25..c8a4f82 100644
--- a/drip-android-observer-master/Android/app/build.gradle
+++ b/drip-android-observer-master/Android/app/build.gradle
@@ -11,7 +11,6 @@ android {
def versionPatch = 0
compileSdkVersion 30
- buildToolsVersion = '29.0.3'
defaultConfig {
applicationId "org.opendroneid.android"
@@ -36,6 +35,7 @@ android {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
+ namespace 'org.dripdronescanner.android'
}
dependencies {
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 5cdad7e..a5a06dd 100644
--- a/drip-android-observer-master/Android/app/src/main/AndroidManifest.xml
+++ b/drip-android-observer-master/Android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?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="org.dripdronescanner.android">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/drip-android-observer-master/Android/build.gradle b/drip-android-observer-master/Android/build.gradle
index 1ab22bc..95a372b 100644
--- a/drip-android-observer-master/Android/build.gradle
+++ b/drip-android-observer-master/Android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath 'com.android.tools.build:gradle:7.3.0'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/drip-android-observer-master/Android/gradle/wrapper/gradle-wrapper.properties b/drip-android-observer-master/Android/gradle/wrapper/gradle-wrapper.properties
index 80b4beb..7cd3c50 100644
--- a/drip-android-observer-master/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/drip-android-observer-master/Android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
--
GitLab