Incremented target sdk version, gradle plugin

osmandapp · Jul 15, 2024 · 8503cbb · 8503cbb
1 parent 72ecc9f
commit 8503cbb
Show file tree

Hide file tree

Showing 13 changed files with 173 additions and 43 deletions.
diff --git a/OsmAnd-api/build.gradle b/OsmAnd-api/build.gradle
@@ -3,14 +3,15 @@ apply plugin: 'ivy-publish'
 
 
 android {
-    compileSdk 33
-    buildToolsVersion = "33.0.2"
+    compileSdk 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 2
         versionName "2.0"
+        namespace = "net.osmand.aidlapi"
     }
     lintOptions {
         abortOnError false
@@ -22,12 +23,26 @@ android {
             java.srcDirs = ["src"]
         }
     }
+    buildFeatures {
+        aidl true
+    }
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+
+        singleVariant('debug') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 version = System.getenv("OSMAND_BINARIES_IVY_REVISION") ?: "master-snapshot"
 afterEvaluate {
     publishing {
-        repositories {    
+        repositories {
             ivy {
                 url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
             }
@@ -56,7 +71,7 @@ dependencies {
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
 }
 

diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle
@@ -86,8 +86,8 @@ task androidJar(type: Jar) {
 	} else {
 		dependsOn build
 	}
-	appendix = "android"
-	from (sourceSets.main.java.outputDir) {
+	archiveAppendix = "android"
+	from (sourceSets.main.java.classesDirectory) {
 		exclude("**/PlatformUtil.*")
 	}
 	from sourceSets.main.resources
@@ -117,7 +117,7 @@ publishing {
         }
 		ivyJava(IvyPublication) {
 			artifact androidJar {
-				classifier 'android'
+				archiveClassifier = 'android'
 			}
 		}
 	}

diff --git a/OsmAnd-shared/build.gradle.kts b/OsmAnd-shared/build.gradle.kts
@@ -43,7 +43,7 @@ kotlin {
 
 android {
     namespace = "net.osmand.shared"
-    compileSdk = 33
+    compileSdk = 34
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11

diff --git a/OsmAnd-telegram/build.gradle b/OsmAnd-telegram/build.gradle
@@ -2,9 +2,18 @@ apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
 
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(17)
+	}
+}
+
 android {
-	compileSdk 33
-	buildToolsVersion = "33.0.2"
+	compileSdk 34
+	buildToolsVersion = "34.0.0"
+
+	namespace = "net.osmand.telegram"
 
 	sourceSets {
 		main {
@@ -22,7 +31,7 @@ android {
 	defaultConfig {
 		applicationId "net.osmand.telegram"
 		minSdkVersion 15
-		targetSdkVersion 33
+		targetSdkVersion 34
 		multiDexEnabled true
 		versionCode 1
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
@@ -92,6 +101,26 @@ android {
 	packagingOptions {
 		exclude 'META-INF/proguard/androidx-annotations.pro'
 	}
+	buildFeatures {
+		aidl true
+	}
+
+	applicationVariants.configureEach {
+		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(collectFonts)
+		}
+		def mapSourceSetPathsName= "map${taskName}SourceSetPaths"
+		osmandTask = tasks.findByName(mapSourceSetPathsName)
+		if(osmandTask != null) {
+			println(osmandTask.getName())
+		}
+	}
+
 }
 
 task downloadTdLibzip {

diff --git a/OsmAnd/build-common.gradle b/OsmAnd/build-common.gradle
@@ -3,16 +3,18 @@ task printc {
 }
 
 android {
-	compileSdk 34
-	buildToolsVersion = "34.0.0"
-	// compileNdkVersion "android-ndk-r17b"
-
-	defaultConfig {
-		targetSdkVersion 33
-		multiDexEnabled true
-		vectorDrawables.useSupportLibrary = true
-		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-	}
+    compileSdk 34
+    buildToolsVersion = "34.0.0"
+    // compileNdkVersion "android-ndk-r17b"
+    namespace = "net.osmand.plus"
+    defaultConfig {
+        targetSdkVersion 34
+        multiDexEnabled true
+        vectorDrawables.useSupportLibrary = true
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        renderscriptTargetApi 18
+        renderscriptSupportModeEnabled true
+    }
 
 	lintOptions {
 		abortOnError false
@@ -97,13 +99,32 @@ android {
 		}
 	}
 
-	buildTypes {
-		debug {
-			debuggable true
-		}
-		release {
-			debuggable false
+    buildTypes {
+        debug {
+            debuggable true
+        }
+        release {
+            debuggable false
+        }
+    }
+
+	applicationVariants.configureEach {
+		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)
 		}
+        def mapSourceSetPathsName= "map${taskName}SourceSetPaths"
+        osmandTask = tasks.findByName(mapSourceSetPathsName)
+        if(osmandTask != null) {
+            println(osmandTask.getName())
+            osmandTask.dependsOn(copyMapShaderIcons)
+        }
 	}
 }
 

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
@@ -18,6 +18,11 @@ apply plugin: 'kotlin-android'
 //            </patternset>
 //        </unzip>
 // Less important
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(17)
+	}
+}
 
 android {
 	signingConfigs {
@@ -105,6 +110,10 @@ android {
 	}
 
 	flavorDimensions "version", "coreversion", "abi"
+	buildFeatures {
+		renderScript true
+		aidl true
+	}
 	productFlavors {
 		// Version
 		nightlyFree {
@@ -170,6 +179,37 @@ android {
 		}
 	}
 
+	applicationVariants.configureEach {
+		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(collectHelpContentsStyle)
+			osmandTask.dependsOn(copyColorPalettes)
+			osmandTask.dependsOn(copy3DModels)
+			osmandTask.dependsOn(collectUiFonts)
+			osmandTask.dependsOn(collectVoiceAssets)
+			osmandTask.dependsOn(downloadWorldMiniBasemap)
+		}
+		def mapSourceSetPathsName= "map${taskName}SourceSetPaths"
+		osmandTask = tasks.findByName(mapSourceSetPathsName)
+		if(osmandTask != null) {
+			println(osmandTask.getName())
+			osmandTask.dependsOn(copyMapPOIIcons)
+			osmandTask.dependsOn(copyLargePOIIcons)
+		}
+		def mergeResources= "merge${taskName}Resources"
+		osmandTask = tasks.findByName(mergeResources)
+		if(osmandTask != null) {
+			println(osmandTask.getName())
+			osmandTask.dependsOn(copyMapShaderIcons)
+			osmandTask.dependsOn(copyMapPOIIcons)
+			osmandTask.dependsOn(copyLargePOIIcons)
+		}
+	}
+
 }
 
 afterEvaluate {

diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,7 @@
 buildscript {
+    ext {
+        agp_version = '8.2'
+    }
     ext.kotlin_version = '1.9.23'
     repositories {
         google()
@@ -8,9 +11,8 @@ buildscript {
         }
     }
     dependencies {
-        //classpath 'com.android.tools.build:gradle:2.+'
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.google.gms:google-services:4.3.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
         if (gradle.startParameter.taskNames.toString().toLowerCase().contains("huawei")) {

diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,8 @@
 # UPDATE 3: Turn on D8 to recover builds with new gradle 6.5 and pluigin 4.1.1
 #android.enableD8=false
 android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+android.enableR8.fullMode=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Jul 15 15:30:46 EEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugins/Osmand-Nautical/build.gradle b/plugins/Osmand-Nautical/build.gradle
@@ -1,9 +1,10 @@
 apply plugin: 'com.android.application'
 
 android {
-	compileSdk 33
-	buildToolsVersion = "33.0.2"
+	compileSdk 34
+	buildToolsVersion = "34.0.0"
 
+	namespace = "net.osmand.nauticalPlugin"
 	signingConfigs {
 		development {
 			storeFile file("../../keystores/debug.keystore")
@@ -21,7 +22,7 @@ android {
 
 	defaultConfig {
 		minSdkVersion 15
-		targetSdkVersion 33
+		targetSdkVersion 34
 	}
 
 	lintOptions {
@@ -50,6 +51,10 @@ android {
 			signingConfig signingConfigs.release
 		}
 	}
+	buildFeatures {
+		renderScript true
+		aidl true
+	}
 }
 
 repositories {

diff --git a/plugins/Osmand-SRTMPlugin/build.gradle b/plugins/Osmand-SRTMPlugin/build.gradle
@@ -1,8 +1,10 @@
 apply plugin: 'com.android.application'
 
 android {
-	compileSdk 33
-	buildToolsVersion = "33.0.2"
+	compileSdk 34
+	buildToolsVersion = "34.0.0"
+
+	namespace = "net.osmand.srtmPlugin.paid"
 
 	signingConfigs {
 		development {
@@ -22,7 +24,7 @@ android {
 
 	defaultConfig {
 		minSdkVersion 15
-		targetSdkVersion 33
+		targetSdkVersion 34
 	}
 
 	lintOptions {
@@ -50,6 +52,10 @@ android {
 			signingConfig signingConfigs.release
 		}
 	}
+	buildFeatures {
+		renderScript true
+		aidl true
+	}
 }
 
 repositories {