Merge pull request #527 from AppDevNext/compileSdk

hannesa2 · web-flow · commit e23dd807d572 · 2023-09-14T08:25:30.000+02:00
Fix compileSdk deprecation
diff --git a/LogcatCoreLib/build.gradle b/LogcatCoreLib/build.gradle
@@ -5,9 +5,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion propCompileSdkVersion
-
     defaultConfig {
+        compileSdk propCompileSdkVersion
         buildConfigField "String", "VERSIONNAME", "\"" + getTag() + "\""
 
         minSdkVersion 16
@@ -18,7 +17,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-
 }
 
 dependencies {
diff --git a/LogcatCoreUI/build.gradle b/LogcatCoreUI/build.gradle
@@ -5,9 +5,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion propCompileSdkVersion
-
     defaultConfig {
+        compileSdk propCompileSdkVersion
         buildConfigField "String", "VERSIONNAME", "\"" + getTag() + "\""
 
         minSdkVersion 16
diff --git a/LogcatCountlyLib/build.gradle b/LogcatCountlyLib/build.gradle
@@ -5,10 +5,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion propCompileSdkVersion
-
     defaultConfig {
-
+        compileSdk propCompileSdkVersion
         minSdkVersion 17
         project.archivesBaseName = "LogcatCountly"
     }
diff --git a/LogcatCrashlyticLib/build.gradle b/LogcatCrashlyticLib/build.gradle
@@ -6,10 +6,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion propCompileSdkVersion
-
     defaultConfig {
-
+        compileSdk propCompileSdkVersion
         minSdkVersion 19
         project.archivesBaseName = "LogcatCrashlytic"
     }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -11,14 +11,13 @@ if (useFirebase() == "true") {
 }
 
 android {
-    compileSdkVersion propCompileSdkVersion
-
     defaultConfig {
         applicationId 'info.hannes.logcat.sample'
         versionCode 1
         versionName "1.0"
 
         minSdkVersion 16
+        compileSdk propCompileSdkVersion
         targetSdkVersion 33
 
         buildConfigField "boolean", 'WITH_FIREBASE', useFirebase()

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,8 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
`8`		`- compileSdkVersion propCompileSdkVersion`
`9`		`-`
`10`	`8`	`defaultConfig {`
	`9`	`+ compileSdk propCompileSdkVersion`
`11`	`10`	`buildConfigField "String", "VERSIONNAME", "\"" + getTag() + "\""`
`12`	`11`
`13`	`12`	`minSdkVersion 16`
`@@ -18,7 +17,6 @@ android {`
`18`	`17`	`sourceCompatibility JavaVersion.VERSION_17`
`19`	`18`	`targetCompatibility JavaVersion.VERSION_17`
`20`	`19`	`}`
`21`		`-`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,8 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
`8`		`- compileSdkVersion propCompileSdkVersion`
`9`		`-`
`10`	`8`	`defaultConfig {`
`11`		`-`
	`9`	`+ compileSdk propCompileSdkVersion`
`12`	`10`	`minSdkVersion 17`
`13`	`11`	`project.archivesBaseName = "LogcatCountly"`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`android {`
`9`		`- compileSdkVersion propCompileSdkVersion`
`10`		`-`
`11`	`9`	`defaultConfig {`
`12`		`-`
	`10`	`+ compileSdk propCompileSdkVersion`
`13`	`11`	`minSdkVersion 19`
`14`	`12`	`project.archivesBaseName = "LogcatCrashlytic"`
`15`	`13`	`}`