Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated version and added global variables #20331

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updated version and added global variables #20331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OsmAnd-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'
apply plugin: 'ivy-publish'

apply from: '../versions.gradle'

android {
compileSdk 34
buildToolsVersion = "34.0.0"

defaultConfig {
minSdkVersion 14
minSdkVersion minSdk
targetSdkVersion 34
versionCode 2
versionName "2.0"
Expand Down
5 changes: 3 additions & 2 deletions OsmAnd-telegram/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: '../versions.gradle'

android {
compileSdk 34
Expand All @@ -26,7 +27,7 @@ android {

defaultConfig {
applicationId "net.osmand.telegram"
minSdkVersion 15
minSdkVersion minSdk
targetSdkVersion 34
multiDexEnabled true
versionCode 1
Expand Down Expand Up @@ -179,5 +180,5 @@ dependencies {
exclude group: 'com.android.support'
}

implementation 'com.google.android.gms:play-services-location:21.0.1'
implementation 'com.google.android.gms:play-services-location:21.3.0'
}
4 changes: 3 additions & 1 deletion OsmAnd/build-common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
apply from: '../versions.gradle'

tasks.register('printc') {
configurations.each { if (it.isCanBeResolved()) println it.name }
}
Expand Down Expand Up @@ -373,7 +375,7 @@ dependencies {
implementation "androidx.car.app:app:1.2.0"
implementation "androidx.car.app:app-projected:1.2.0"

implementation 'com.google.android.gms:play-services-location:21.3.0'
implementation 'com.google.android.gms:play-services-location:$play_services_location'

//implementation "androidx.tracing:tracing:1.1.0"
//debugImplementation 'androidx.test:monitor:1.6.1'
Expand Down
5 changes: 3 additions & 2 deletions OsmAnd/build-library.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
apply plugin: 'com.android.library'
apply plugin: 'ivy-publish'
apply from: 'build-common.gradle'
apply from: '../versions.gradle'

apply plugin: 'kotlin-android'

android {

defaultConfig {
minSdkVersion 24
minSdkVersion minSdk
}

lintOptions {
Expand Down Expand Up @@ -93,5 +94,5 @@ project.afterEvaluate {
}

dependencies {
implementation 'com.google.android.gms:play-services-location:21.3.0'
implementation "com.google.android.gms:play-services-location:$play_services_location"
}
3 changes: 2 additions & 1 deletion OsmAnd/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apply plugin: 'com.android.application'
apply from: 'build-common.gradle'
apply from: '../versions.gradle'

apply plugin: 'kotlin-android'

Expand Down Expand Up @@ -42,7 +43,7 @@ android {
}

defaultConfig {
minSdkVersion 24
minSdkVersion minSdk
versionCode 4800
versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
versionName "4.8.0"
Expand Down
3 changes: 2 additions & 1 deletion plugins/Osmand-Nautical/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
apply from: '../../versions.gradle'

android {
compileSdk 34
Expand All @@ -21,7 +22,7 @@ android {
}

defaultConfig {
minSdkVersion 15
minSdkVersion minSdk
targetSdkVersion 34
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/Osmand-SRTMPlugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ android {
}

defaultConfig {
minSdkVersion 15
minSdkVersion minSdk
targetSdkVersion 34
}

Expand Down
3 changes: 2 additions & 1 deletion plugins/Osmand-Skimaps/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
apply from: '../../versions.gradle'

android {
compileSdk 34
Expand All @@ -23,7 +24,7 @@ android {
}

defaultConfig {
minSdkVersion 15
minSdkVersion minSdk
targetSdkVersion 34
}

Expand Down
4 changes: 4 additions & 0 deletions versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ext {
play_servises_location = "21.3.0"
minSdk = 24
}
Loading