diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-sqliter-driver-1.0.10-appleMain-FvcGuA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-sqliter-driver-1.0.10-appleMain-FvcGuA.klib new file mode 100644 index 00000000000..81f228f4c47 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-sqliter-driver-1.0.10-appleMain-FvcGuA.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-sqliter-driver-1.0.10-nativeCommonMain-On1ODg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-sqliter-driver-1.0.10-nativeCommonMain-On1ODg.klib new file mode 100644 index 00000000000..1a9ce6708d0 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-sqliter-driver-1.0.10-nativeCommonMain-On1ODg.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-collections-1.1.10-commonMain-Kv_3Og.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-collections-1.1.10-commonMain-Kv_3Og.klib new file mode 100644 index 00000000000..de8c40ab94e Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-collections-1.1.10-commonMain-Kv_3Og.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-collections-1.1.10-nativeCommonMain-Kv_3Og.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-collections-1.1.10-nativeCommonMain-Kv_3Og.klib new file mode 100644 index 00000000000..c319690272c Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-collections-1.1.10-nativeCommonMain-Kv_3Og.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-common-1.1.10-commonMain-LxFZig.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-common-1.1.10-commonMain-LxFZig.klib new file mode 100644 index 00000000000..84a0fedab69 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-common-1.1.10-commonMain-LxFZig.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-common-1.1.10-nativeCommonMain-LxFZig.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-common-1.1.10-nativeCommonMain-LxFZig.klib new file mode 100644 index 00000000000..8be3cde0e3e Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-common-1.1.10-nativeCommonMain-LxFZig.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-commonMain-n2q0oQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-commonMain-n2q0oQ.klib new file mode 100644 index 00000000000..a6ceeb5fd56 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-commonMain-n2q0oQ.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-darwinMain-NwRdGw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-darwinMain-NwRdGw.klib new file mode 100644 index 00000000000..5f19659af60 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-darwinMain-NwRdGw.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-nativeCommonMain-n2q0oQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-nativeCommonMain-n2q0oQ.klib new file mode 100644 index 00000000000..99bbd961f7d Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-1.1.10-nativeCommonMain-n2q0oQ.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-native-driver-1.5.4-nativeDarwinMain-WmdBCw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-native-driver-1.5.4-nativeDarwinMain-WmdBCw.klib new file mode 100644 index 00000000000..a1e66716ebd Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-native-driver-1.5.4-nativeDarwinMain-WmdBCw.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-native-driver-1.5.4-nativeMain-cFX7Hw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-native-driver-1.5.4-nativeMain-cFX7Hw.klib new file mode 100644 index 00000000000..aab769ae0e3 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-native-driver-1.5.4-nativeMain-cFX7Hw.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-runtime-1.5.4-commonMain-gCqkaA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-runtime-1.5.4-commonMain-gCqkaA.klib new file mode 100644 index 00000000000..e6e9dca8e35 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-runtime-1.5.4-commonMain-gCqkaA.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-runtime-1.5.4-nativeMain-gCqkaA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-runtime-1.5.4-nativeMain-gCqkaA.klib new file mode 100644 index 00000000000..1d89afddf1f Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.sqldelight-runtime-1.5.4-nativeMain-gCqkaA.klib differ diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.0.0-commonMain-2bbUHA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.0.0-commonMain-2bbUHA.klib new file mode 100644 index 00000000000..bfc0cd37a04 Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.0.0-commonMain-2bbUHA.klib differ diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle index ff5c8a3b307..5ec4a6b905b 100644 --- a/OsmAnd-java/build.gradle +++ b/OsmAnd-java/build.gradle @@ -6,19 +6,18 @@ configurations { android } -//tasks.withType(JavaCompile) { -// sourceCompatibility = "1.7" -// targetCompatibility = "1.7" -// options.encoding = 'UTF-8' -//} +tasks.withType(JavaCompile).configureEach { + sourceCompatibility = "17" + targetCompatibility = "17" +} -task collectRoutingResources(type: Sync) { +tasks.register('collectRoutingResources', Sync) { from "../../resources/routing" into "src/main/resources/net/osmand/router" include "*.xml" } -task collectMiscResources(type: Copy) { +tasks.register('collectMiscResources', Copy) { into "src/main/resources/net/osmand/osm" from("../../resources/obf_creation") { include "rendering_types.xml" @@ -28,27 +27,27 @@ task collectMiscResources(type: Copy) { } } -task collectRenderingStylesResources(type: Sync) { +tasks.register('collectRenderingStylesResources', Sync) { from "../../resources/rendering_styles" into "src/main/resources/net/osmand/render" include "*.xml" } -task collectRegionsInfoResources(type: Download) { +tasks.register('collectRegionsInfoResources', Download) { src 'https://creator.osmand.net/basemap/regions.ocbf' dest 'src/main/resources/net/osmand/map/regions.ocbf' onlyIfModified true } -task collectTestPhrasesResources(type: Copy) { +tasks.register('collectTestPhrasesResources', Copy) { into "src/test/resources/phrases/en/" from("../OsmAnd/res/values") { include "phrases.xml" } } -task collectTestResources(type: Copy) { +tasks.register('collectTestResources', Copy) { into "src/test/resources/" from("../../resources/test-resources") { include "*" @@ -71,23 +70,23 @@ processTestResources { dependsOn collectTestResources, collectTestPhrasesResources } -task collectExternalResources { +tasks.register('collectExternalResources') { dependsOn collectRoutingResources, - collectRenderingStylesResources, - collectRegionsInfoResources, - collectTestResources, - collectTestPhrasesResources, - collectMiscResources + collectRenderingStylesResources, + collectRegionsInfoResources, + collectTestResources, + collectTestPhrasesResources, + collectMiscResources } -task androidJar(type: Jar) { +tasks.register('androidJar', Jar) { if (!project.hasProperty('osmandCoreSimple')) { dependsOn collectExternalResources, build } else { dependsOn build } archiveAppendix = "android" - from (sourceSets.main.java.classesDirectory) { + from(sourceSets.main.java.classesDirectory) { exclude("**/PlatformUtil.*") } from sourceSets.main.resources diff --git a/OsmAnd-shared/build.gradle.kts b/OsmAnd-shared/build.gradle.kts index 19ae67982b0..286367470ec 100644 --- a/OsmAnd-shared/build.gradle.kts +++ b/OsmAnd-shared/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { androidTarget { compilations.all { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } } @@ -45,10 +45,10 @@ android { namespace = "net.osmand.shared" compileSdk = 34 compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { - minSdk = 23 + minSdk = 24 } } diff --git a/OsmAnd-telegram/build.gradle b/OsmAnd-telegram/build.gradle index 6b8ad0147ed..f6230b1a633 100644 --- a/OsmAnd-telegram/build.gradle +++ b/OsmAnd-telegram/build.gradle @@ -4,13 +4,16 @@ apply plugin: 'kotlin-android' android { compileSdk 34 buildToolsVersion = "34.0.0" - namespace = "net.osmand.telegram" + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + sourceSets { main { manifest.srcFile "AndroidManifest.xml" - jni.srcDirs = [] jniLibs.srcDirs = ["libs"] aidl.srcDirs = ["src"] java.srcDirs = ["src"] @@ -56,6 +59,7 @@ android { dimension "abi" } } + signingConfigs { development { storeFile file("../keystores/debug.keystore") @@ -101,58 +105,60 @@ android { def variant = it def taskName = variant.name.capitalize() def mergeAssetsTaskName = "merge${taskName}Assets" - def osmandTask = tasks.findByName(mergeAssetsTaskName) - if (osmandTask != null) { + tasks.named(mergeAssetsTaskName).configure { osmandTask -> println(osmandTask.getName()) osmandTask.dependsOn(collectFonts) } def mapSourceSetPathsName= "map${taskName}SourceSetPaths" - osmandTask = tasks.findByName(mapSourceSetPathsName) - if(osmandTask != null) { + tasks.named(mapSourceSetPathsName).configure { osmandTask -> println(osmandTask.getName()) } } } -task downloadTdLibzip { +tasks.register('downloadTdLibzip') { doLast { ant.get(src: 'https://osmand.net/uploads/libs/tdlib.zip', dest: 'tdlib.zip', skipexisting: 'true') ant.unzip(src: 'tdlib.zip', dest: 'tdlib/') } } -task copyNativeLibs(type: Copy) { +tasks.register('copyNativeLibs', Copy) { dependsOn downloadTdLibzip from "tdlib/tdlib/libs" into "libs" } -task copyJavaSources(type: Copy) { +tasks.register('copyJavaSources', Copy) { dependsOn downloadTdLibzip from "tdlib/tdlib/java" into "src" } -task downloadPrebuiltTelegram { +tasks.register('downloadPrebuiltTelegram') { dependsOn downloadTdLibzip, copyNativeLibs, copyJavaSources } -task collectFonts(type: Copy) { +tasks.register('collectFonts', Copy) { from "../../resources/fonts" from "../../resources/fonts-telegram" into "assets/fonts" include "*.ttf" } -task collectExternalResources { +tasks.register('collectExternalResources') { dependsOn collectFonts } afterEvaluate { - android.applicationVariants.all { variant -> - variant.javaCompiler.dependsOn(downloadPrebuiltTelegram, collectExternalResources) - variant.preBuild.dependsOn(downloadPrebuiltTelegram) + android.applicationVariants.configureEach { variant -> + variant.javaCompileProvider.configure { compileTask -> + compileTask.dependsOn downloadPrebuiltTelegram, collectExternalResources + } + variant.preBuildProvider.configure { preBuildTask -> + preBuildTask.dependsOn downloadPrebuiltTelegram + } } } diff --git a/OsmAnd/build-common.gradle b/OsmAnd/build-common.gradle index e8cc0a1fd5f..c2bf228e989 100644 --- a/OsmAnd/build-common.gradle +++ b/OsmAnd/build-common.gradle @@ -1,5 +1,5 @@ -task printc { - configurations.each { if(it.isCanBeResolved()) println it.name } +tasks.register('printc') { + configurations.each { if (it.isCanBeResolved()) println it.name } } android { @@ -39,7 +39,6 @@ android { sourceSets { main { manifest.srcFile "AndroidManifest.xml" - jni.srcDirs = [] jniLibs.srcDirs = ["libs"] aidl.srcDirs = ["src"] java.srcDirs = ["src"] @@ -82,6 +81,7 @@ android { armonly { dimension "abi" ndk { + //noinspection ChromeOsAbiSupport abiFilters 'arm64-v8a', 'armeabi-v7a' } } @@ -112,19 +112,17 @@ android { def variant = it def taskName = variant.name.capitalize() def mergeAssetsTaskName = "merge${taskName}Assets" - def osmandTask = tasks.findByName(mergeAssetsTaskName) - if (osmandTask != null) { - println(osmandTask.getName()) - osmandTask.dependsOn(copyProjDb) - osmandTask.dependsOn(collectFonts) - osmandTask.dependsOn(copyPoiCategories) + tasks.named(mergeAssetsTaskName).configure { osmandTask -> + println(osmandTask.getName()) + osmandTask.dependsOn(copyProjDb) + osmandTask.dependsOn(collectFonts) + osmandTask.dependsOn(copyPoiCategories) } def mapSourceSetPathsName= "map${taskName}SourceSetPaths" - osmandTask = tasks.findByName(mapSourceSetPathsName) - if(osmandTask != null) { - println(osmandTask.getName()) - osmandTask.dependsOn(copyMapShaderIcons) - } + tasks.named(mapSourceSetPathsName).configure { osmandTask -> + println(osmandTask.getName()) + osmandTask.dependsOn(copyMapShaderIcons) + } } } @@ -136,7 +134,7 @@ clean.doFirst { } } -task validateTranslate { +tasks.register('validateTranslate') { println "Validating translations" file("res").eachFileRecurse groovy.io.FileType.FILES, { @@ -155,100 +153,100 @@ task validateTranslate { } } -task downloadWorldMiniBasemap(type: Download) { +tasks.register('downloadWorldMiniBasemap', Download) { src 'https://creator.osmand.net/basemap/World_basemap_mini_2.obf' dest 'assets/World_basemap_mini.obf' onlyIfModified true } -task downloadWorldMiniBasemapAnt { +tasks.register('downloadWorldMiniBasemapAnt') { doLast { ant.get(src: 'https://creator.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true') } } -task collectVoiceAssets(type: Sync) { +tasks.register('collectVoiceAssets', Sync) { from "../../resources/voice" into "assets/voice" include "**/*.js" } -task collectFonts(type: Copy) { +tasks.register('collectFonts', Copy) { from "../../resources/rendering_styles/fonts" // from "../../resources/rendering_styles/fonts/OpenSans" into "assets/fonts" include "*.ttf" } -task collectUiFonts(type: Copy) { +tasks.register('collectUiFonts', Copy) { from "../../resources/fonts" into "assets/ui-fonts" include "*.ttf" } -task collectHelpContentsStyle(type: Copy) { +tasks.register('collectHelpContentsStyle', Copy) { from("../../help/website/help/") { include "style.css" } into "assets" } -task copyProjDb(type: Copy) { +tasks.register('copyProjDb', Copy) { from("../../resources/proj") { include "proj.db" } into "assets" } -task copyColorPalettes(type: Copy) { +tasks.register('copyColorPalettes', Copy) { from "../../resources/color-palette" into "assets/color-palette" include "*.*" } -task copyPoiCategories(type: Copy) { +tasks.register('copyPoiCategories', Copy) { from("../../resources/poi") { include "poi_categories.json" } into "assets" } -task copyMapShaderIcons(type: Sync) { +tasks.register('copyMapShaderIcons', Sync) { // from "../../resources/rendering_styles/style-icons/map-shaders-png" // into "res/" from "../../resources/rendering_styles/style-icons/map-shaders-vector" into "res/drawable" - include "**/*.png", "**/*.xml" + include "**/*.png", "**/*.xml" preserve { include '**/*' - exclude "**/h_*" + exclude "**/h_*" } } -task copyMapPOIIcons(type: Sync) { +tasks.register('copyMapPOIIcons', Sync) { from "../../resources/rendering_styles/style-icons/map-icons-vector" into "res/drawable/" // from "../../resources/rendering_styles/style-icons/map-icons-png" // into "res/" - include "**/*.png", "**/*.xml" + include "**/*.png", "**/*.xml" preserve { include '**/*' exclude "**/mm_*" } } -task copyLargePOIIcons(type: Sync) { +tasks.register('copyLargePOIIcons', Sync) { from "../../resources/rendering_styles/style-icons/poi-icons-vector" into "res/drawable/" - include "**/*.png", "**/*.xml" + include "**/*.png", "**/*.xml" preserve { include '**/*' exclude "**/mx_*" } } -task collectTestResources(type: Copy) { +tasks.register('collectTestResources', Copy) { into "test/assets/" from("../../resources/test-resources/ui/") { include "*" @@ -257,13 +255,13 @@ task collectTestResources(type: Copy) { } } -task copy3DModels(type: Copy) { +tasks.register('copy3DModels', Copy) { from "../../resources/models" into "assets/models" include "**/*.*" } -task collectExternalResources { +tasks.register('collectExternalResources') { dependsOn collectVoiceAssets, collectFonts, collectUiFonts, @@ -283,21 +281,21 @@ task collectExternalResources { // Legacy core build import org.apache.tools.ant.taskdefs.condition.Os -task buildOsmAndCore(type: Exec) { +tasks.register('buildOsmAndCore', Exec) { Gradle gradle = getGradle() String tskReqStr = gradle.getStartParameter().getTaskRequests().toString().toLowerCase() String flavour = "" - if(!tskReqStr.contains("fat")) { - if(tskReqStr.contains("arm64")) { + if (!tskReqStr.contains("fat")) { + if (tskReqStr.contains("arm64")) { flavour = flavour.length() == 0 ? "ARM64_ONLY" : "" } - if(tskReqStr.contains("armv7")) { + if (tskReqStr.contains("armv7")) { flavour = flavour.length() == 0 ? "ARMV7_ONLY" : "" } - if(tskReqStr.contains("armonly")) { + if (tskReqStr.contains("armonly")) { flavour = flavour.length() == 0 ? "ARM_ONLY" : "" } - if(tskReqStr.contains("x86")) { + if (tskReqStr.contains("x86")) { flavour = flavour.length() == 0 ? "X86_ONLY" : "" } } @@ -305,7 +303,7 @@ task buildOsmAndCore(type: Exec) { description "Build Legacy OsmAndCore" if (!Os.isFamily(Os.FAMILY_WINDOWS)) { - if(flavour.length() > 0) { + if (flavour.length() > 0) { environment "$flavour", "1" } commandLine "bash", file("./old-ndk-build.sh").getAbsolutePath() @@ -314,7 +312,7 @@ task buildOsmAndCore(type: Exec) { } } -task cleanupDuplicatesInCore() { +tasks.register('cleanupDuplicatesInCore') { dependsOn buildOsmAndCore // doesn't work for legacy debug builds doLast { @@ -329,7 +327,7 @@ task cleanupDuplicatesInCore() { } } -task appStart(type: Exec) { +tasks.register('appStart', Exec) { // linux commandLine 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity' // windows @@ -387,7 +385,7 @@ dependencies { implementation('com.github.scribejava:scribejava-apis:7.1.1') implementation 'com.jaredrummler:colorpicker:1.1.0' implementation 'org.bouncycastle:bcpkix-jdk15on:1.56' - implementation 'com.google.android.play:core:1.9.1' + implementation 'com.google.android.play:review:2.0.1' implementation "androidx.car.app:app:1.2.0" implementation "androidx.car.app:app-projected:1.2.0" diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 13c5bc3b8cd..90cfd1eb662 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -36,6 +36,11 @@ android { } } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + defaultConfig { minSdkVersion 24 versionCode 4800 @@ -178,8 +183,7 @@ android { def variant = it def taskName = variant.name.capitalize() def mergeAssetsTaskName = "merge${taskName}Assets" - def osmandTask = tasks.findByName(mergeAssetsTaskName) - if (osmandTask != null) { + tasks.named(mergeAssetsTaskName).configure { osmandTask -> println(osmandTask.getName()) osmandTask.dependsOn(collectHelpContentsStyle) osmandTask.dependsOn(copyColorPalettes) @@ -189,15 +193,13 @@ android { osmandTask.dependsOn(downloadWorldMiniBasemap) } def mapSourceSetPathsName= "map${taskName}SourceSetPaths" - osmandTask = tasks.findByName(mapSourceSetPathsName) - if(osmandTask != null) { + tasks.named(mapSourceSetPathsName).configure { osmandTask -> println(osmandTask.getName()) osmandTask.dependsOn(copyMapPOIIcons) osmandTask.dependsOn(copyLargePOIIcons) } def mergeResources= "merge${taskName}Resources" - osmandTask = tasks.findByName(mergeResources) - if(osmandTask != null) { + tasks.named(mergeResources).configure { osmandTask -> println(osmandTask.getName()) osmandTask.dependsOn(copyMapShaderIcons) osmandTask.dependsOn(copyMapPOIIcons) @@ -208,13 +210,18 @@ android { } afterEvaluate { - android.applicationVariants.all { variant -> + android.applicationVariants.configureEach { variant -> if (variant.name.contains('Opengldebug')) { - variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, copyOsmAndCoreWithJNI, cleanupDuplicatesInCore) + variant.javaCompileProvider.configure { + dependsOn collectExternalResources, buildOsmAndCore, copyOsmAndCoreWithJNI, cleanupDuplicatesInCore + } } else { - variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore) + variant.javaCompileProvider.configure { + dependsOn collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore + } } } + Gradle gradle = getGradle() String tskReqStr = gradle.getStartParameter().getTaskRequests().toString().toLowerCase() if (tskReqStr.contains("huawei")) { @@ -222,7 +229,7 @@ afterEvaluate { } } -task copyOsmAndCoreWithJNI() { +tasks.register('copyOsmAndCoreWithJNI') { dependsOn buildOsmAndCore doLast { file("libs/armeabi-v7a").mkdirs() diff --git a/OsmAnd/src/net/osmand/plus/feedback/RateUsHelper.java b/OsmAnd/src/net/osmand/plus/feedback/RateUsHelper.java index 7efbc1c6330..4793e439cb8 100644 --- a/OsmAnd/src/net/osmand/plus/feedback/RateUsHelper.java +++ b/OsmAnd/src/net/osmand/plus/feedback/RateUsHelper.java @@ -9,7 +9,7 @@ import com.google.android.play.core.review.ReviewInfo; import com.google.android.play.core.review.ReviewManager; import com.google.android.play.core.review.ReviewManagerFactory; -import com.google.android.play.core.tasks.Task; +import com.google.android.gms.tasks.Task; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; diff --git a/build.gradle b/build.gradle index e262903ad74..c8f0647b579 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,5 @@ buildscript { - ext { - agp_version = '8.2' - } - ext.kotlin_version = '1.9.23' + ext.kotlin_version = '2.0.0' repositories { google() mavenCentral() diff --git a/ui-test-app/app/build.gradle.kts b/ui-test-app/app/build.gradle.kts index 24fa65670a2..285742a900a 100644 --- a/ui-test-app/app/build.gradle.kts +++ b/ui-test-app/app/build.gradle.kts @@ -25,8 +25,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } }