Skip to content

Commit 6b472f8

Browse files
authored
Merge pull request #12 from baato/update/releaseV
Update/release v
2 parents 8e78796 + cf0704f commit 6b472f8

4 files changed

Lines changed: 21 additions & 21 deletions

File tree

app/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
}
44

55
android {
6-
compileSdkVersion 34
6+
compileSdkVersion 30
77

88
defaultConfig {
99
applicationId "com.example.osmnavigationapp"
10-
minSdkVersion 21
11-
targetSdkVersion 33
10+
minSdkVersion 15
11+
targetSdkVersion 30
1212
versionCode 1
1313
versionName "1.0"
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,13 +29,13 @@ android {
2929

3030
dependencies {
3131
implementation fileTree(dir: 'libs', include: ['*.jar'])
32-
implementation 'androidx.appcompat:appcompat:1.6.1'
33-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
34-
testImplementation 'junit:junit:4.13.2'
35-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
36-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
32+
implementation 'androidx.appcompat:appcompat:1.1.0'
33+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
34+
testImplementation 'junit:junit:4.12'
35+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
36+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3737

3838
// baato library
3939
implementation project(':baatolibrary')
40-
// implementation 'com.github.baato:java-client:1.4.6'
41-
}
40+
// implementation 'com.github.baato:java-client:1.2.5'
41+
}

baatolibrary/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdkVersion 34
8-
7+
compileSdkVersion 32
8+
buildToolsVersion "29.0.3"
99

1010
defaultConfig {
11-
minSdkVersion 21
12-
targetSdkVersion 33
11+
minSdkVersion 15
12+
targetSdkVersion 32
1313
versionCode 1
1414
versionName "1.0"
1515

@@ -34,10 +34,10 @@ android {
3434
dependencies {
3535
implementation fileTree(dir: 'libs', include: ['*.jar'])
3636
//todo updating to latest cause mapbox issues so halting for now
37-
implementation 'androidx.appcompat:appcompat:1.6.1'
37+
implementation 'androidx.appcompat:appcompat:1.2.0'
3838
testImplementation 'junit:junit:4.13.2'
39-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
40-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
39+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
40+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
4141

4242
//retrofit
4343
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -59,7 +59,7 @@ publishing {
5959
release(MavenPublication) {
6060
groupId = 'com.github.baato'
6161
artifactId = 'java-client'
62-
version = '1.4.5'
62+
version = '1.4.10'
6363

6464
afterEvaluate {
6565
from project.components.findByName('release')

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77

88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.3.1'
10+
classpath 'com.android.tools.build:gradle:7.0.2'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
@@ -26,4 +26,4 @@ allprojects {
2626

2727
task clean(type: Delete) {
2828
delete rootProject.buildDir
29-
}
29+
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

0 commit comments

Comments
 (0)