commit 684cb2611643818b146af359cea5bafa783ffdb4
parent f329a026972dfa73e740bcadfd43d25336126d1f
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date: Wed, 13 Sep 2023 15:53:50 +0200
build: remove DSL_SCOPE_VIOLATION
- remove unused comments
Diffstat:
6 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,5 @@
import com.android.build.gradle.internal.api.BaseVariantOutputImpl
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,4 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,8 +1,8 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinAndroid)
}
+
android {
namespace = rootProject.ext["applicationId"].toString() + ".core"
compileSdk = 34
diff --git a/gradle.properties b/gradle.properties
@@ -1,24 +1,5 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
+org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
android.useAndroidX=true
-# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false
\ No newline at end of file
diff --git a/mapper/build.gradle.kts b/mapper/build.gradle.kts
@@ -1,6 +1,5 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
- id("com.android.library")
+ alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinAndroid)
}
diff --git a/native/build.gradle.kts b/native/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinAndroid)
