From 575d5e868ed4201f171bfa7e05a0387e72c4eeee Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 13 Jun 2024 21:54:39 +0200 Subject: [PATCH] Update target sdk to 35 --- android-library-no-tests/build.gradle.kts | 2 +- .../flank/gradle/integration/FulladlePluginIntegrationTest.kt | 2 +- .../flank/gradle/integration/SanityWithAutoConfigureTest.kt | 2 +- .../java/com/osacky/flank/gradle/integration/VariantTests.kt | 4 ++-- .../resources/android-library-project-flavors/build.gradle | 4 ++-- .../src/test/resources/android-library-project/build.gradle | 4 ++-- .../src/test/resources/android-project-flavors/build.gradle | 4 ++-- fladle-plugin/src/test/resources/android-project/build.gradle | 4 ++-- .../src/test/resources/android-project2/build.gradle | 4 ++-- sample-android-library/build.gradle.kts | 2 +- sample-flavors-kotlin/build.gradle.kts | 2 +- sample-kotlin/build.gradle.kts | 2 +- sample/build.gradle | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/android-library-no-tests/build.gradle.kts b/android-library-no-tests/build.gradle.kts index bed1b75d..6ab51eec 100644 --- a/android-library-no-tests/build.gradle.kts +++ b/android-library-no-tests/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } android { - compileSdk = 33 + compileSdk = 35 namespace = "com.osacky.flank.gradle.sample.library" defaultConfig { minSdk = 23 diff --git a/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/FulladlePluginIntegrationTest.kt b/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/FulladlePluginIntegrationTest.kt index de3db3b5..baf0934c 100644 --- a/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/FulladlePluginIntegrationTest.kt +++ b/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/FulladlePluginIntegrationTest.kt @@ -941,7 +941,7 @@ class FulladlePluginIntegrationTest { id "com.android.application" } android { - compileSdk 33 + compileSdk 35 namespace "com.osacky.flank.gradle.sample" defaultConfig { applicationId "com.osacky.flank.gradle.sample" diff --git a/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/SanityWithAutoConfigureTest.kt b/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/SanityWithAutoConfigureTest.kt index 3c0c27f5..687fd3fc 100644 --- a/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/SanityWithAutoConfigureTest.kt +++ b/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/SanityWithAutoConfigureTest.kt @@ -13,7 +13,7 @@ private const val COMMON_SCRIPT_PART = """ } android { - compileSdk 33 + compileSdk 35 namespace "com.osacky.flank.gradle.sample" defaultConfig { applicationId "com.osacky.flank.gradle.sample" diff --git a/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/VariantTests.kt b/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/VariantTests.kt index c0f9a0c5..d04d9d00 100644 --- a/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/VariantTests.kt +++ b/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/VariantTests.kt @@ -161,12 +161,12 @@ class VariantTests { mavenCentral() } android { - compileSdk 33 + compileSdk 35 namespace = "com.osacky.flank.gradle.sample" defaultConfig { applicationId "com.osacky.flank.gradle.sample" minSdk 23 - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/fladle-plugin/src/test/resources/android-library-project-flavors/build.gradle b/fladle-plugin/src/test/resources/android-library-project-flavors/build.gradle index 73bcc57c..e0c10057 100644 --- a/fladle-plugin/src/test/resources/android-library-project-flavors/build.gradle +++ b/fladle-plugin/src/test/resources/android-library-project-flavors/build.gradle @@ -3,10 +3,10 @@ plugins { } android { - compileSdk 33 + compileSdk 35 namespace = "com.osacky.flank.gradle.sample" defaultConfig { - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/fladle-plugin/src/test/resources/android-library-project/build.gradle b/fladle-plugin/src/test/resources/android-library-project/build.gradle index 7890fc20..7e9a93f4 100644 --- a/fladle-plugin/src/test/resources/android-library-project/build.gradle +++ b/fladle-plugin/src/test/resources/android-library-project/build.gradle @@ -3,10 +3,10 @@ plugins { } android { - compileSdk 33 + compileSdk 35 namespace = "com.osacky.flank.gradle.sample" defaultConfig { - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/fladle-plugin/src/test/resources/android-project-flavors/build.gradle b/fladle-plugin/src/test/resources/android-project-flavors/build.gradle index f9e08150..d03401be 100644 --- a/fladle-plugin/src/test/resources/android-project-flavors/build.gradle +++ b/fladle-plugin/src/test/resources/android-project-flavors/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 33 + compileSdk 35 namespace = "com.osacky.flank.gradle.sample" defaultConfig { applicationId "com.osacky.flank.gradle.sample" minSdk 23 - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/fladle-plugin/src/test/resources/android-project/build.gradle b/fladle-plugin/src/test/resources/android-project/build.gradle index 3d4ab993..1aa9119f 100644 --- a/fladle-plugin/src/test/resources/android-project/build.gradle +++ b/fladle-plugin/src/test/resources/android-project/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 33 + compileSdk 35 namespace = "com.osacky.flank.gradle.sample" defaultConfig { applicationId "com.osacky.flank.gradle.sample" minSdk 23 - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/fladle-plugin/src/test/resources/android-project2/build.gradle b/fladle-plugin/src/test/resources/android-project2/build.gradle index 9a1bc5bc..cdaf21f6 100644 --- a/fladle-plugin/src/test/resources/android-project2/build.gradle +++ b/fladle-plugin/src/test/resources/android-project2/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 33 + compileSdk 35 namespace = "com.osacky.flank.gradle.sample" defaultConfig { applicationId "com.osacky.flank.gradle.sample" minSdk 23 - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/sample-android-library/build.gradle.kts b/sample-android-library/build.gradle.kts index 751c6fca..50f39e97 100644 --- a/sample-android-library/build.gradle.kts +++ b/sample-android-library/build.gradle.kts @@ -18,7 +18,7 @@ fulladleModuleConfig { android { namespace = "com.osacky.flank.gradle.sample" - compileSdk = 33 + compileSdk = 35 defaultConfig { minSdk = 23 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/sample-flavors-kotlin/build.gradle.kts b/sample-flavors-kotlin/build.gradle.kts index f4c1932b..a1683b29 100644 --- a/sample-flavors-kotlin/build.gradle.kts +++ b/sample-flavors-kotlin/build.gradle.kts @@ -6,7 +6,7 @@ plugins { android { namespace = "com.osacky.flank.gradle.sample.kotlin" - compileSdk = 33 + compileSdk = 35 defaultConfig { applicationId = "com.osacky.flank.gradle.sample.kotlin" minSdk = 23 diff --git a/sample-kotlin/build.gradle.kts b/sample-kotlin/build.gradle.kts index 93cc9d16..8e38a5ed 100644 --- a/sample-kotlin/build.gradle.kts +++ b/sample-kotlin/build.gradle.kts @@ -6,7 +6,7 @@ plugins { android { namespace = "com.osacky.flank.gradle.sample.kotlin" - compileSdk = 33 + compileSdk = 35 defaultConfig { applicationId = "com.osacky.flank.gradle.sample.kotlin" minSdk = 23 diff --git a/sample/build.gradle b/sample/build.gradle index 19dc3426..8bc2981b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'kotlin-android' apply plugin: 'com.osacky.fladle' android { - compileSdk = 33 + compileSdk = 35 namespace = "com.osacky.flank.gradle.sample" defaultConfig { applicationId "com.osacky.flank.gradle.sample" minSdk 23 - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"