Skip to content

Commit 9bfeadb

Browse files
author
Josh Eldridge
committed
Okay here's some working stuff
1 parent b3411c9 commit 9bfeadb

File tree

7 files changed

+37
-92
lines changed

7 files changed

+37
-92
lines changed

analytics/build.gradle.kts

+1-26
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,9 @@
11
plugins {
2-
alias(libs.plugins.androidLibrary)
3-
alias(libs.plugins.jetbrainsKotlinAndroid)
2+
alias(libs.plugins.com.michiganlabs.hoverboard.android.library)
43
}
54

65
android {
76
namespace = "com.michiganlabs.hoverboard.analytics"
8-
compileSdk = libs.versions.compileSdk.get().toInt()
9-
10-
defaultConfig {
11-
minSdk = libs.versions.minSdk.get().toInt()
12-
13-
consumerProguardFiles("consumer-rules.pro")
14-
}
15-
16-
buildTypes {
17-
release {
18-
isMinifyEnabled = false
19-
proguardFiles(
20-
getDefaultProguardFile("proguard-android-optimize.txt"),
21-
"proguard-rules.pro"
22-
)
23-
}
24-
}
25-
compileOptions {
26-
sourceCompatibility = JavaVersion.VERSION_17
27-
targetCompatibility = JavaVersion.VERSION_17
28-
}
29-
kotlinOptions {
30-
jvmTarget = libs.versions.jvmTarget.get()
31-
}
327
}
338

349
publishing {

compose/build.gradle.kts

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,16 @@
11
plugins {
2-
alias(libs.plugins.androidLibrary)
3-
alias(libs.plugins.jetbrainsKotlinAndroid)
4-
2+
alias(libs.plugins.com.michiganlabs.hoverboard.android.library)
53
id("maven-publish")
64
}
75

86
android {
97
namespace = "com.michiganlabs.hoverboard.compose"
10-
compileSdk = libs.versions.compileSdk.get().toInt()
11-
128
defaultConfig {
13-
minSdk = libs.versions.minSdk.get().toInt()
14-
159
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
16-
consumerProguardFiles("consumer-rules.pro")
1710
}
1811
buildFeatures {
1912
compose = true
2013
}
21-
composeOptions {
22-
kotlinCompilerExtensionVersion = "1.5.10"
23-
}
24-
buildTypes {
25-
release {
26-
isMinifyEnabled = false
27-
proguardFiles(
28-
getDefaultProguardFile("proguard-android-optimize.txt"),
29-
"proguard-rules.pro"
30-
)
31-
}
32-
}
33-
compileOptions {
34-
sourceCompatibility = JavaVersion.VERSION_17
35-
targetCompatibility = JavaVersion.VERSION_17
36-
}
37-
kotlinOptions {
38-
jvmTarget = libs.versions.jvmTarget.get()
39-
}
4014
}
4115

4216
publishing {

convention-plugins/convention/build.gradle.kts

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ plugins {
77
group = "com.michiganlabs.hoverboard.convention-plugins"
88
version = "1.0"
99

10-
publishing {
11-
repositories {
12-
maven {
13-
// change to point to your repo, e.g. http://my.org/repo
14-
url = uri(layout.buildDirectory.dir("repo"))
15-
}
16-
}
17-
}
18-
19-
tasks.publish {
20-
dependsOn("check")
21-
}
10+
//publishing {
11+
// repositories {
12+
// maven {
13+
// // change to point to your repo, e.g. http://my.org/repo
14+
// url = uri(layout.buildDirectory.dir("repo"))
15+
// }
16+
// }
17+
//}
18+
//
19+
//tasks.publish {
20+
// dependsOn("check")
21+
//}
2222

2323
kotlin {
2424
jvmToolchain(17)
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
dependencyResolutionManagement {
2+
repositories {
3+
google()
4+
gradlePluginPortal()
5+
mavenCentral()
6+
}
7+
versionCatalogs {
8+
create("libs") {
9+
from(files("../gradle/libs.versions.toml"))
10+
}
11+
}
12+
}
13+
14+
rootProject.name = "convention-plugins"
15+
include(":convention")

gradle/libs.versions.toml

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ espressoCore = "3.5.1"
2121
material = "1.10.0"
2222

2323
[libraries]
24+
com-android-gradle-plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }
25+
org-jetbrains-kotlin-android-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
26+
2427
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
2528
androidx-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compiler" }
2629
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
@@ -39,4 +42,6 @@ material = { group = "com.google.android.material", name = "material", version.r
3942

4043
[plugins]
4144
androidLibrary = { id = "com.android.library", version.ref = "agp" }
42-
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
45+
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
46+
47+
com-michiganlabs-hoverboard-android-library = { id = "com.michiganlabs.hoverboard.android-library", version = "unspecified" }

networking/build.gradle.kts

+1-26
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,11 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
2+
alias(libs.plugins.com.michiganlabs.hoverboard.android.library)
43
id("com.google.devtools.ksp")
54
id("maven-publish")
65
}
76

87
android {
98
namespace = "com.michiganlabs.hoverboard.data"
10-
compileSdk = libs.versions.compileSdk.get().toInt()
11-
12-
defaultConfig {
13-
minSdk = libs.versions.minSdk.get().toInt()
14-
15-
consumerProguardFiles("consumer-rules.pro")
16-
}
17-
18-
buildTypes {
19-
release {
20-
isMinifyEnabled = false
21-
proguardFiles(
22-
getDefaultProguardFile("proguard-android-optimize.txt"),
23-
"proguard-rules.pro"
24-
)
25-
}
26-
}
27-
compileOptions {
28-
sourceCompatibility = JavaVersion.VERSION_17
29-
targetCompatibility = JavaVersion.VERSION_17
30-
}
31-
kotlinOptions {
32-
jvmTarget = libs.versions.jvmTarget.get()
33-
}
349
}
3510

3611
publishing {

settings.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencyResolutionManagement {
2929
}
3030

3131
rootProject.name = "hoverboard"
32+
includeBuild("convention-plugins")
3233
include(":networking")
3334
include(":compose")
3435
include(":analytics")

0 commit comments

Comments
 (0)