Skip to content

Commit d17ec99

Browse files
committed
cleanup build logic
1 parent 347dd4d commit d17ec99

File tree

9 files changed

+13
-68
lines changed

9 files changed

+13
-68
lines changed

build-logic/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`kotlin-dsl`
33
}
44

5-
group = "ycharts.android.buildlogic"
5+
group = "ycharts.android"
66

77
repositories {
88
mavenCentral()
@@ -19,6 +19,11 @@ dependencies {
1919
compileOnly(versionCatalogLibs.kotlin.gradle.plugin)
2020
}
2121

22+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
23+
kotlinOptions {
24+
jvmTarget = versionCatalogLibs.versions.kotlinJvmTarget.get()
25+
}
26+
}
2227
gradlePlugin {
2328
plugins {
2429
register("androidApplication") {

build-logic/src/main/java/conventions/ApplicationConventionPlugin.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import org.gradle.api.Project
66
import org.gradle.api.artifacts.VersionCatalogsExtension
77
import org.gradle.kotlin.dsl.configure
88
import org.gradle.kotlin.dsl.getByType
9-
import ytemplate.android.configureFlavors
10-
import ytemplate.android.configureKotlinAndroid
9+
import ycharts.android.configureKotlinAndroid
1110

1211
/**
1312
* Application convention plugin

build-logic/src/main/java/conventions/ComposeApplicationConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.api.artifacts.VersionCatalogsExtension
77
import org.gradle.kotlin.dsl.getByType
8-
import ytemplate.android.configureComposeApplication
8+
import ycharts.android.configureComposeApplication
99

1010
/**
1111
* Compose application convention plugin

build-logic/src/main/java/conventions/LibraryComposeConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.api.artifacts.VersionCatalogsExtension
77
import org.gradle.kotlin.dsl.getByType
8-
import ytemplate.android.configureComposeApplication
8+
import ycharts.android.configureComposeApplication
99

1010
/**
1111
* Library compose convention plugin

build-logic/src/main/java/conventions/LibraryConventionPlugin.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import org.gradle.kotlin.dsl.configure
88
import org.gradle.kotlin.dsl.dependencies
99
import org.gradle.kotlin.dsl.getByType
1010
import org.gradle.kotlin.dsl.kotlin
11-
import ytemplate.android.configureFlavors
12-
import ytemplate.android.configureKotlinAndroid
11+
import ycharts.android.configureKotlinAndroid
1312

1413
/**
1514
* Library convention plugin

build-logic/src/main/java/ytemplate/android/AppBuildType.kt renamed to build-logic/src/main/java/ycharts/android/AppBuildType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package ytemplate.android
17+
package ycharts.android
1818

1919
/**
2020
* This is shared between :app and :benchmarks module to provide configurations type safety.

build-logic/src/main/java/ytemplate/android/ComposeApplication.kt renamed to build-logic/src/main/java/ycharts/android/ComposeApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ytemplate.android
1+
package ycharts.android
22

33
import com.android.build.api.dsl.CommonExtension
44
import org.gradle.api.Project

build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt renamed to build-logic/src/main/java/ycharts/android/KotlinAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ytemplate.android
1+
package ycharts.android
22

33
import com.android.build.api.dsl.CommonExtension
44
import org.gradle.api.JavaVersion

build-logic/src/main/java/ytemplate/android/AppFlavor.kt

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)