Build improvements

MateusRodCosta · Sep 25, 2023 · 5fa22b4 · 5fa22b4
1 parent d5b3290
commit 5fa22b4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -31,8 +31,13 @@ def keystorePropertiesFile = rootProject.file("key.properties")
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
+kotlin {
+    jvmToolchain 17
+}
+
 android {
     namespace "com.mateusrodcosta.apps.vidyamusic"
+
     compileSdk  33
     defaultConfig {
         applicationId "com.mateusrodcosta.apps.vidyamusic"
@@ -42,17 +47,6 @@ android {
         versionName flutterVersionName
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     signingConfigs {
         release {
             keyAlias keystoreProperties['keyAlias']
@@ -61,6 +55,7 @@ android {
             storePassword keystoreProperties['storePassword']
         }
     }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -80,12 +75,19 @@ android {
             manifestPlaceholders = [appName: "Vidya Music (Profile)"]
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 flutter {
     source '../..'
 }
 
 dependencies {
-    implementation libs.kotlin.stdlib
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -3,14 +3,14 @@ plugins {
     alias libs.plugins.kotlin.android apply false
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.set(new File('../build'))
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.set(rootProject.layout.buildDirectory.dir(project.name))
 }
 subprojects {
     project.evaluationDependsOn(':app')
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,2 +1,4 @@
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
-android.useAndroidX=true
+android.useAndroidX=true
+org.gradle.caching=true
+org.gradle.parallel=true
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -3,7 +3,6 @@ androidGradlePlugin = "8.1.1"
 kotlinVersion = "1.9.10"
 
 [libraries]
-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinVersion" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -14,7 +14,7 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "vidya_music"
+rootProject.name = "Vidya Music"
 include ':app'
 
 def localPropertiesFile = new File(rootProject.projectDir, "local.properties")