Skip to content

Commit

Permalink
Convert all build files to kts
Browse files Browse the repository at this point in the history
Change-Id: I26bf730ee51f62cbd604c02b628c1f277cfceb72
  • Loading branch information
alexvanyo authored and dturner committed May 11, 2022
1 parent 08c655e commit b677cc4
Show file tree
Hide file tree
Showing 28 changed files with 609 additions and 604 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
* limitations under the License.
*/
plugins {
id 'nowinandroid.android.application'
id 'nowinandroid.android.application.compose'
id("nowinandroid.android.application")
id("nowinandroid.android.application.compose")
}

android {
defaultConfig {
applicationId "com.google.samples.apps.niacatalog"
applicationId = "com.google.samples.apps.niacatalog"
}

packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
}
}
}

dependencies {
implementation project(':core-ui')
implementation(project(":core-ui"))

implementation libs.androidx.activity.compose
implementation(libs.androidx.activity.compose)
}
2 changes: 1 addition & 1 deletion app-nia-catalog/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
# proguardFiles setting in build.gradle.kts.
#
# For more details, see
# http:https://developer.android.com/guide/developing/tools/proguard.html
Expand Down
102 changes: 0 additions & 102 deletions app/build.gradle

This file was deleted.

102 changes: 102 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
/*
* Copyright 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
plugins {
id("nowinandroid.android.application")
id("nowinandroid.android.application.compose")
id("nowinandroid.android.application.jacoco")
kotlin("kapt")
id("jacoco")
id("dagger.hilt.android.plugin")
id("nowinandroid.spotless")
}

android {
defaultConfig {
applicationId = "com.google.samples.apps.nowinandroid"
versionCode = 1
versionName = "0.0.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level

// Custom test runner to set up Hilt dependency graph
testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
vectorDrawables {
useSupportLibrary = true
}
}

buildTypes {
val release by getting {
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
val benchmark by creating {
initWith(release)
signingConfig = signingConfigs.getByName("debug")
matchingFallbacks.add("release")
proguardFiles("benchmark-rules.pro")
}
}
packagingOptions {
resources {
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
}
}
testOptions {
unitTests {
isIncludeAndroidResources = true
}
}
}

dependencies {
implementation(project(":feature-following"))
implementation(project(":feature-foryou"))
implementation(project(":feature-topic"))

implementation(project(":core-ui"))

implementation(project(":sync"))

androidTestImplementation(project(":core-testing"))
androidTestImplementation(project(":core-datastore-test"))
androidTestImplementation(project(":core-domain-test"))
androidTestImplementation(project(":core-network"))

implementation(libs.androidx.activity.compose)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.compose.material3.windowSizeClass)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.window.manager)
implementation(libs.material3)
implementation(libs.androidx.profileinstaller)

implementation(libs.coil.kt)
implementation(libs.coil.kt.svg)

implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
kaptAndroidTest(libs.hilt.compiler)

// androidx.test is forcing JUnit, 4.12. This forces it to use 4.13
configurations.configureEach {
resolutionStrategy {
force(libs.junit4)
// Temporary workaround for https://issuetracker.google.com/174733673
force("org.objenesis:objenesis:2.6")
}
}
}
38 changes: 19 additions & 19 deletions benchmark/build.gradle → benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
*/

plugins {
id "nowinandroid.android.test"
id 'nowinandroid.spotless'
id("nowinandroid.android.test")
id("nowinandroid.spotless")
}

android {
namespace 'com.google.samples.apps.nowinandroid.benchmark'
namespace = "com.google.samples.apps.nowinandroid.benchmark"

defaultConfig {
minSdk 23
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
minSdk = 23
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
// This benchmark buildType is used for benchmarking, and should function like your
// release build (for example, with minification on). It's signed with a debug key
// for easy local/CI testing.
benchmark {
debuggable true
signingConfig debug.signingConfig
matchingFallbacks = ['release']
val benchmark by creating {
isDebuggable = true
signingConfig = signingConfigs.getByName("debug")
matchingFallbacks.add("release")
}
}

Expand All @@ -43,18 +43,18 @@ android {
}

dependencies {
implementation libs.androidx.test.core
implementation libs.androidx.test.espresso.core
implementation libs.androidx.test.ext
implementation libs.androidx.test.runner
implementation libs.androidx.test.rules
implementation libs.androidx.test.uiautomator
implementation libs.androidx.benchmark.macro
implementation libs.androidx.profileinstaller
implementation(libs.androidx.test.core)
implementation(libs.androidx.test.espresso.core)
implementation(libs.androidx.test.ext)
implementation(libs.androidx.test.runner)
implementation(libs.androidx.test.rules)
implementation(libs.androidx.test.uiautomator)
implementation(libs.androidx.benchmark.macro)
implementation(libs.androidx.profileinstaller)
}

androidComponents {
beforeVariants(selector().all()) {
enabled = buildType == "benchmark"
beforeVariants {
it.enable = it.buildType == "benchmark"
}
}
File renamed without changes.
14 changes: 7 additions & 7 deletions core-common/build.gradle → core-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* limitations under the License.
*/
plugins {
id "nowinandroid.android.library"
id "nowinandroid.android.library.jacoco"
id 'kotlin-kapt'
id 'nowinandroid.spotless'
id("nowinandroid.android.library")
id("nowinandroid.android.library.jacoco")
kotlin("kapt")
id("nowinandroid.spotless")
}

dependencies {
implementation libs.kotlinx.coroutines.android
implementation libs.hilt.android
kapt libs.hilt.compiler
implementation(libs.kotlinx.coroutines.android)
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
}
34 changes: 17 additions & 17 deletions core-database/build.gradle → core-database/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*/
plugins {
id 'nowinandroid.android.library'
id "nowinandroid.android.library.jacoco"
id 'kotlin-kapt'
id 'dagger.hilt.android.plugin'
id("nowinandroid.android.library")
id("nowinandroid.android.library.jacoco")
kotlin("kapt")
id("dagger.hilt.android.plugin")
alias(libs.plugins.ksp)
id 'nowinandroid.spotless'
id("nowinandroid.spotless")
}

android {
Expand All @@ -31,31 +31,31 @@ android {
arg("room.schemaLocation", "$projectDir/schemas")
}

testInstrumentationRunner "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
}
}

dependencies {
implementation project(':core-model')
implementation(project(":core-model"))

implementation libs.room.runtime
implementation libs.room.ktx
ksp libs.room.compiler
implementation(libs.room.runtime)
implementation(libs.room.ktx)
ksp(libs.room.compiler)

implementation libs.kotlinx.coroutines.android
implementation libs.kotlinx.datetime
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.datetime)

implementation libs.hilt.android
kapt libs.hilt.compiler
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)

androidTestImplementation project(':core-testing')
androidTestImplementation(project(":core-testing"))

// androidx.test is forcing JUnit, 4.12. This forces it to use 4.13
configurations.configureEach {
resolutionStrategy {
force libs.junit4
force(libs.junit4)
// Temporary workaround for https://issuetracker.google.com/174733673
force 'org.objenesis:objenesis:2.6'
force("org.objenesis:objenesis:2.6")
}
}
}
Loading

0 comments on commit b677cc4

Please sign in to comment.