Switch to package publication on Github Packages. Switch from kap to …

…ksp for Room. Use lib dependency from Maven Central in driver demo. Signed-off-by: ingonoka <ingonoka@icloud.com>
ingonoka · Mar 6, 2024 · 535748b · 535748b
1 parent b0eebd8
commit 535748b
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 27 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,25 +24,32 @@ buildscript {
 
 plugins {
 
-//    id("maven-publish")
     id("org.asciidoctor.jvm.convert")
     id("org.jetbrains.dokka")
-//    id("org.jetbrains.kotlin.android") version "${project.properties["kotlin_version"].toString()}"
-//    id 'com.android.application' version '7.0.4' apply false
+    id("com.google.devtools.ksp")  version "1.8.10-1.0.9" apply false
 }
 
-fun getVersionCode() = try {
+/**
+ * Number of commits from the start of this repository
+ */
+fun getVersionCode(): Int = try {
     val stdout = ByteArrayOutputStream()
     exec {
-        commandLine = listOf("git", "rev-list", "--first-parent", "--count", "master")
+        commandLine =
+            listOf("git", "rev-list", "--first-parent", "--count", "master")
         standardOutput = stdout
     }
     Integer.parseInt(stdout.toString().trim())
 } catch (e: Exception) {
     -1
 }
 
-fun getVersionName() = try {
+/**
+ * Get a version name of the form "v0.3-8-g9518e52", which is the tag
+ * assigned to the commit (v0.3), the number of commits since the
+ * commit the tag is assigned to and the hash of the latest commit
+ */
+fun getVersionName(): String = try {
     val stdout = ByteArrayOutputStream()
     exec {
         commandLine = listOf("git", "describe", "--tags") //, '--long'
@@ -57,19 +64,25 @@ fun getVersionName() = try {
 extra.apply {
     set("domain", "com.ingonoka")
     set("pom_developer", "Ingo Noka")
-    set("pom_licenseName", "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)")
-    set("pom_licenseUrl", "https://creativecommons.org/licenses/by-nc-nd/4.0/")
-    set("group","com.ingonoka")
-    set("versionName", getVersionName() ?: "na")
-    set("versionCode", getVersionCode() ?: 0)
+    set(
+        "pom_licenseName",
+        "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)"
+    )
+    set(
+        "pom_licenseUrl",
+        "https://creativecommons.org/licenses/by-nc-nd/4.0/"
+    )
+    set("group", "com.ingonoka")
+    set("versionName", getVersionName())
+    set("versionCode", getVersionCode())
 }
 
 group = "com.ingonoka"
 
 
 tasks.dokkaHtmlMultiModule.configure {
-    outputDirectory.set(buildDir.resolve("$buildDir/dokka"))
-    moduleName.set("NFC Adapter for Android")
+    outputDirectory.set(layout.buildDirectory.file("dokka").get().asFile)
+    moduleName.set("CBA9 Driver for Android")
     includes.from("module.md")
 }
 
@@ -83,12 +96,5 @@ asciidoctorj {
 
 tasks {
     "asciidoctor"(AsciidoctorTask::class) {
-//        baseDirFollowsSourceDir()
-//        sourceDir = buildDir.resolve("docs")
-//        outputDir.set(buildDir.resolve("build/docs"))
-//
-//        attributes["source-highlighter"] = "rouge"
-//
-//        attributes["revnumber"] = getVersionName()
     }
 }
diff --git a/cba9driverdemo/build.gradle.kts b/cba9driverdemo/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     implementation("org.slf4j:slf4j-api:${providers.gradleProperty("slf4j_version").get()}")
     implementation("com.github.tony19:logback-android:${providers.gradleProperty("logback_android_version").get()}")
-//    implementation "com.ingonoka:cba9-driver:v0.1-0-g1af64e1"
+    implementation("com.ingonoka:cba9driver:v0.3-8-g9518e52")
 
-    implementation(project(":lib"))
+//    implementation(project(":lib"))
 }
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -12,7 +12,8 @@
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("kotlin-kapt")
+//    id("kotlin-kapt")
+    id("com.google.devtools.ksp")
     id("maven-publish")
     id("signing")
     id("org.asciidoctor.jvm.convert")
@@ -33,7 +34,6 @@ android {
     defaultConfig {
 
         minSdk = project.properties["android_min_sdk_version"].toString().toInt()
-        targetSdk = project.properties["android_target_sdk_version"].toString().toInt()
         resourceConfigurations.addAll(listOf("en", "de"))
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -82,7 +82,8 @@ dependencies {
     implementation("org.slf4j:slf4j-api:${providers.gradleProperty("slf4j_version").get()}")
 
     implementation("androidx.room:room-ktx:${providers.gradleProperty("room_version").get()}")
-    kapt("androidx.room:room-compiler:${providers.gradleProperty("room_version").get()}")
+//    kapt("androidx.room:room-compiler:${providers.gradleProperty("room_version").get()}")
+    ksp("androidx.room:room-compiler:${providers.gradleProperty("room_version").get()}")
 
 }
 
@@ -105,7 +106,7 @@ afterEvaluate {
 
             register<MavenPublication>("debug") {
                 groupId = "com.ingonoka"
-                artifactId = "cba9driver"
+                artifactId = "cba9driver-debug"
                 version = version.toString()
 
                 from(components["debug"])
@@ -148,13 +149,22 @@ afterEvaluate {
                         password = providers.gradleProperty("sonatype_pw").get()
                     }
                 }
+
+                maven {
+                    name = "GitHubPackages"
+                    url = uri("https://maven.pkg.github.com/ingonoka/cba9-driver")
+                    credentials {
+                        username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+                        password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+                    }
+                }
             }
         }
     }
 }
 
 tasks.dokkaHtmlPartial.configure {
-    outputDirectory.set(buildDir.resolve("$buildDir/dokka"))
+    outputDirectory.set(layout.buildDirectory.file("dokka").get().asFile)
     moduleName.set("NFC Adapter for Android")
     dokkaSourceSets {
         configureEach {