Skip to content

Commit

Permalink
Merge pull request #125 from Aisalkyn/master
Browse files Browse the repository at this point in the history
Library, Gradle, sdk updates
  • Loading branch information
Lezh1k authored Apr 21, 2023
2 parents 6627a98 + cf95dbf commit 4c5278b
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<activity
android:name=".MainActivity"
android:screenOrientation="portrait"
android:configChanges="keyboardHidden|orientation|screenSize">
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions madlocationmanager/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ ext {
}

android {
compileSdkVersion 30
compileSdkVersion 33
defaultConfig {
minSdkVersion 18
targetSdkVersion 30
targetSdkVersion 33
versionCode 1
versionName "1.0"

Expand All @@ -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) {
Expand Down

0 comments on commit 4c5278b

Please sign in to comment.