build.gradleの整理

anko/build.gradle

@@ -8,11 +8,12 @@ plugins {
 android {
     namespace "jp.juggler.anko"
 
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
+
     defaultConfig {
         minSdk stMinSdkVersion
         targetSdk stTargetSdkVersion
-        compileSdk(stCompileSdkVersion)
-        setBuildToolsVersion(stBuildToolsVersion)
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

apng_android/build.gradle

@@ -7,12 +7,12 @@ plugins {
 
 android {
     namespace "jp.juggler.apng"
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
 
     defaultConfig {
         minSdk(stMinSdkVersion)
         targetSdk(stTargetSdkVersion)
-        compileSdk(stCompileSdkVersion)
-        setBuildToolsVersion(stBuildToolsVersion)
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/build.gradle

@@ -19,11 +19,12 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 android {
     namespace "jp.juggler.subwaytooter"
 
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
+
     defaultConfig {
         targetSdk(stTargetSdkVersion)
         minSdk(stMinSdkVersion)
-        compileSdk(stCompileSdkVersion)
-        setBuildToolsVersion(stBuildToolsVersion)
 
         versionCode 537
         versionName "5.537"

base/build.gradle

@@ -7,11 +7,12 @@ plugins {
 android {
     namespace "jp.juggler.base"
 
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
+
     defaultConfig {
         minSdk stMinSdkVersion
         targetSdk stTargetSdkVersion
-        compileSdk(stCompileSdkVersion)
-        setBuildToolsVersion(stBuildToolsVersion)
 
         consumerProguardFiles "consumer-rules.pro"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

colorpicker/build.gradle

@@ -7,15 +7,18 @@ plugins {
 
 android {
     namespace 'com.jrummyapps.android.colorpicker'
+
     resourcePrefix "cpv_"
 
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
+
     defaultConfig {
         minSdk(stMinSdkVersion)
         targetSdk(stTargetSdkVersion)
-        compileSdk(stCompileSdkVersion)
-        setBuildToolsVersion(stBuildToolsVersion)
-        vectorDrawables.useSupportLibrary = true
+
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
 
     lint {

emoji/build.gradle

@@ -6,11 +6,12 @@ apply plugin: "kotlin-android"
 android {
     namespace 'jp.juggler.emoji'
 
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
+
     defaultConfig {
         minSdk(stMinSdkVersion)
         targetSdk(stTargetSdkVersion)
-        compileSdk(stCompileSdkVersion)
-        setBuildToolsVersion(stBuildToolsVersion)
         vectorDrawables.useSupportLibrary = true
     }
 

icon_material_symbols/build.gradle

@@ -5,8 +5,10 @@ plugins {
 
 android {
     namespace "jp.juggler.icon_material_symbols"
-    compileSdk stCompileSdkVersion
-    buildToolsVersion stBuildToolsVersion
+
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
+
     defaultConfig {
         minSdk stMinSdkVersion
         targetSdk stTargetSdkVersion

sample_apng/build.gradle

@@ -1,20 +1,18 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdkVersion stCompileSdkVersion
-    buildToolsVersion stBuildToolsVersion
+    namespace 'jp.juggler.apng.sample'
 
-    compileOptions {
-        sourceCompatibility javaSourceCompatibility
-        targetCompatibility javaTargetCompatibility
-    }
+    compileSdk(stCompileSdkVersion)
+    setBuildToolsVersion(stBuildToolsVersion)
 
     defaultConfig {
-        targetSdkVersion stTargetSdkVersion
-        minSdkVersion stMinSdkVersion
+        targetSdk(stTargetSdkVersion)
+        minSdk(stMinSdkVersion)
 
-        applicationId "jp.juggler.apng.sample"
         versionCode 1
         versionName "1.0"
 
@@ -34,6 +32,10 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility javaSourceCompatibility
+        targetCompatibility javaTargetCompatibility
+    }
 
     kotlinOptions {
         jvmTarget = kotlinJvmTarget
@@ -45,16 +47,14 @@ android {
 //                "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
         ]
     }
-    namespace 'jp.juggler.apng.sample'
-}
+    kotlin {
+        jvmToolchain(kotlinJvmToolchain)
+    }
 
-kotlin {
-    jvmToolchain(kotlinJvmToolchain)
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-    kotlinOptions {
-        jvmTarget = kotlinJvmTarget
+    tasks.withType(KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = kotlinJvmTarget
+        }
     }
 }