build.gradle updated.

Author: syslogic

build.gradle

@@ -39,12 +39,9 @@ plugins {
 /** Version Settings, loaded from file `version.properties` */
 def version = new Properties()
 version.load(new FileInputStream(rootProject.file('version.properties')))
-project.ext.set('applicationId', version['applicationId'])
 project.ext.set('versionName', version['versionName'])
 project.ext.set('versionCode', new Integer(version['versionCode']))
 
-/** TODO: better should load the versionName from git tag */
-
 /* JitPack: use tag as versionName. */
 if (System.env.JITPACK) {
     project.ext.set('versionName', System.env.VERSION)

library/build.gradle

@@ -5,21 +5,24 @@ plugins {
 
 android {
     namespace 'io.syslogic.github.api'
+    buildToolsVersion = '34.0.0'
     compileSdk 34
-
     defaultConfig {
         minSdk 22
         targetSdk 34
+        setProperty("archivesBaseName", "androidx_github_" + versionName)
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$rootDir/schema".toString()]
+                arguments = [ "room.schemaLocation": "$rootDir/schema".toString() ]
             }
         }
     }
 
+    sourceSets.main.java.srcDirs = [ "src/main/java" ]
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -104,14 +107,14 @@ tasks.register('javadoc', Javadoc) {
     // javadoc: warning - The code being documented uses modules but the packages
     // defined in https://developer.android.com/reference/ are in the unnamed module.
     options.links "https://docs.oracle.com/en/java/javase/17/docs/api/"
-    options.linksOffline "https://developer.android.com/reference", "${android.sdkDirectory}/docs/reference"
+    // options.linksOffline "https://developer.android.com/reference", "${android.sdkDirectory}/docs/reference"
     options.linkSource true
     options.author true
 
     doFirst {
 
         // extract AAR files
-        configurations.implementation.filter { it.name.endsWith('.aar') }.each { aar ->
+        configurations.named("implementation").filter { it.name.endsWith('.aar') }.each { aar ->
             copy {
                 from zipTree(aar)
                 include "**/classes.jar"

mobile/build.gradle

@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-
+    namespace 'io.syslogic.github'
+    buildToolsVersion = '34.0.0'
     compileSdk 34
     defaultConfig {
-        applicationId rootProject.ext.get('applicationId')
-        namespace rootProject.ext.get('applicationId')
+        applicationId 'io.syslogic.github'
         versionName rootProject.ext.get('versionName')
         versionCode rootProject.ext.get('versionCode')
         manifestPlaceholders = [ accessToken: "" ]
@@ -19,12 +19,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testBuildType "debug"
         multiDexEnabled true
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$rootDir/schema".toString()]
-            }
-        }
     }
 
     compileOptions {
@@ -123,9 +117,7 @@ dependencies {
     androidTestImplementation "androidx.fragment:fragment-testing:$fragment_version"
     implementation "androidx.fragment:fragment:$fragment_version"
 
-    // Room
-    annotationProcessor "androidx.room:room-compiler:$room_version"
-    testImplementation "androidx.room:room-testing:$room_version"
+    // Room Runtime
     implementation "androidx.room:room-runtime:$room_version"
 
     // Retrofit2

version.properties

@@ -1,3 +1,2 @@
-applicationId = io.syslogic.github
 versionName = 1.0.0
 versionCode = 1