From cf95dbf23173cf8241ecbfa1e27abddb114cf382 Mon Sep 17 00:00:00 2001 From: aisalkyntashmatova Date: Thu, 20 Apr 2023 22:52:47 +0600 Subject: [PATCH] Lib_updates --- app/build.gradle | 20 ++++++++++---------- app/src/main/AndroidManifest.xml | 3 ++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- madlocationmanager/build.gradle | 12 ++++++------ 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e3d7031..5957d2d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 33 defaultConfig { applicationId "com.example.lezh1k.sensordatacollector" - minSdkVersion 18 - targetSdkVersion 30 + minSdkVersion 21 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -27,15 +27,15 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.constraintlayout:constraintlayout:2.0.2' - testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' api group: 'net.sf.marineapi', name: 'marineapi', version: '0.10.0' - api 'com.google.android.gms:play-services-location:17.1.0' - api 'androidx.preference:preference:1.1.1' - implementation 'com.google.android.gms:play-services-maps:17.0.0' + api 'com.google.android.gms:play-services-location:21.0.1' + api 'androidx.preference:preference:1.2.0' + implementation 'com.google.android.gms:play-services-maps:18.1.0' api ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.5@aar') { transitive = true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ee52428..e2d1f1f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,8 @@ + android:configChanges="keyboardHidden|orientation|screenSize" + android:exported="true"> diff --git a/build.gradle b/build.gradle index 539f7c2..2daf012 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' - classpath "com.android.tools.build:gradle:4.0.2" + classpath 'com.android.tools.build:gradle:4.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ed61b3f..418bef8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7.1-all.zip diff --git a/madlocationmanager/build.gradle b/madlocationmanager/build.gradle index 865a07d..4b4a46d 100644 --- a/madlocationmanager/build.gradle +++ b/madlocationmanager/build.gradle @@ -13,10 +13,10 @@ ext { } android { - compileSdkVersion 30 + compileSdkVersion 33 defaultConfig { minSdkVersion 18 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -40,10 +40,10 @@ dependencies { api 'androidx.legacy:legacy-support-v4:1.0.0' api 'com.google.android.material:material:1.2.1' api 'androidx.recyclerview:recyclerview:1.1.0' - implementation "com.google.android.gms:play-services-location:17.1.0" - testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation "com.google.android.gms:play-services-location:21.0.1" + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } task sourceJar(type: Jar) {