[1.13.0-rc] Version 1.13.0 (#2504)

Author: taridepaco

.github/workflows/ci.yml

@@ -0,0 +1,102 @@
+name: Deploy
+
+on:
+  # Called by CI workflow when deployment is needed
+  workflow_call:
+    secrets:
+      SONATYPE_PORTAL_USERNAME:
+        required: true
+      SONATYPE_PORTAL_PASSWORD:
+        required: true
+  # Allow manual deployment
+  workflow_dispatch:
+    inputs:
+      force_deploy:
+        description: 'Force deployment even if not on develop or RC branch'
+        required: false
+        type: boolean
+        default: false
+
+concurrency:
+  group: deploy-${{ github.ref }}
+  cancel-in-progress: false
+
+env:
+  GRADLE_OPTS: >-
+    -Dorg.gradle.daemon=false
+    -Dorg.gradle.parallel=true
+    -Dorg.gradle.caching=true
+    -Dorg.gradle.configuration-cache=true
+    -Dkotlin.incremental=true
+    -Dkotlin.compiler.execution.strategy=in-process
+
+jobs:
+  validate:
+    name: Validate Deployment
+    runs-on: ubuntu-latest
+    outputs:
+      should_deploy: ${{ steps.check.outputs.should_deploy }}
+    
+    steps:
+      - name: Check deployment conditions
+        id: check
+        run: |
+          BRANCH="${{ github.ref_name }}"
+          
+          # Check if it's a valid branch for deployment
+          if [[ "$BRANCH" == "develop" ]] || [[ "$BRANCH" =~ -rc$ ]] || [[ "$BRANCH" =~ -RC$ ]]; then
+            echo "should_deploy=true" >> $GITHUB_OUTPUT
+            echo "✅ Deployment allowed for branch: $BRANCH"
+          elif [ "${{ inputs.force_deploy }}" == "true" ]; then
+            echo "should_deploy=true" >> $GITHUB_OUTPUT
+            echo "⚠️ Forced deployment for branch: $BRANCH"
+          else
+            echo "should_deploy=false" >> $GITHUB_OUTPUT
+            echo "❌ Deployment skipped: Branch $BRANCH is not develop or RC"
+          fi
+
+  deploy:
+    name: Deploy to Sonatype
+    runs-on: ubuntu-latest
+    needs: validate
+    if: needs.validate.outputs.should_deploy == 'true'
+    timeout-minutes: 20
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
+      
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      
+      - name: Publish to Sonatype
+        run: ./gradlew :core:publishToSonatype
+        env:
+          NEXUS_USERNAME: ${{ secrets.SONATYPE_PORTAL_USERNAME }}
+          NEXUS_PASSWORD: ${{ secrets.SONATYPE_PORTAL_PASSWORD }}
+      
+      - name: Extract version
+        id: version
+        run: |
+          VERSION=$(./gradlew -q printVersion 2>/dev/null || echo "unknown")
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+      
+      - name: Create deployment summary
+        run: |
+          echo "## 🚀 Deployment Successful" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Branch:** ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
+          echo "**Version:** ${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "**Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Published to Sonatype Nexus" >> $GITHUB_STEP_SUMMARY
+

.github/workflows/deploy.yml

@@ -1,6 +1,6 @@
 # DHIS2 Android SDK
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.hisp.dhis/android-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.hisp.dhis/android-core)
+[![Maven Central](https://img.shields.io/maven-central/v/org.hisp.dhis/android-core?label=maven%20central)](https://central.sonatype.com/artifact/org.hisp.dhis/android-core)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=dhis2_dhis2-android-sdk&metric=coverage&branch=master)](https://sonarcloud.io/summary/new_code?id=dhis2_dhis2-android-sdk&branch=master)
 [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=dhis2_dhis2-android-sdk&metric=ncloc&branch=master)](https://sonarcloud.io/summary/new_code?id=dhis2_dhis2-android-sdk&branch=master)
 [![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://dhis2.github.io/dhis2-android-sdk/api/)

.idea/gradle.xml

@@ -0,0 +1 @@
+/build

Jenkinsfile

@@ -0,0 +1,3 @@
+plugins {
+    kotlin("jvm")
+}

README.md

@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2025, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.processor
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class GenerateDaoQueries(val tableName: String, val parentColumnName: String = "")

annotations/.gitignore

@@ -1,4 +1,6 @@
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
+import org.jetbrains.kotlin.gradle.dsl.*
+import com.android.build.api.dsl.*
 
 group = "org.hisp.dhis"
 version = libs.versions.dhis2AndroidSdkVersion.get()
@@ -27,33 +29,11 @@ buildscript {
 }
 
 plugins {
-    alias(libs.plugins.sonarqube)
     alias(libs.plugins.dokka)
     alias(libs.plugins.nexus.publish)
     alias(libs.plugins.cyclonedx)
 }
 
-sonarqube {
-    properties {
-        val branch = System.getenv("GIT_BRANCH")
-        val targetBranch = System.getenv("GIT_BRANCH_DEST")
-        val pullRequestId = System.getenv("PULL_REQUEST")
-
-        property("sonar.projectKey", "dhis2_dhis2-android-sdk")
-        property("sonar.organization", "dhis2")
-        property("sonar.host.url", "https://sonarcloud.io")
-        property("sonar.projectName", "dhis2-android-sdk")
-
-        if (pullRequestId == null) {
-            property("sonar.branch.name", branch)
-        } else {
-            property("sonar.pullrequest.base", targetBranch)
-            property("sonar.pullrequest.branch", branch)
-            property("sonar.pullrequest.key", pullRequestId)
-        }
-    }
-}
-
 allprojects {
     repositories {
         mavenCentral()
@@ -66,6 +46,54 @@ allprojects {
 
 apply(from = "tasks.gradle.kts")
 
+val jvmVersion = libs.versions.java.get().toInt()
+
+plugins.withType<JavaPlugin> {
+    extensions.configure<JavaPluginExtension> {
+        toolchain { languageVersion.set(JavaLanguageVersion.of(jvmVersion)) }
+    }
+}
+
+subprojects {
+    // Kotlin JVM pure
+    plugins.withId("org.jetbrains.kotlin.jvm") {
+        extensions.configure<KotlinJvmProjectExtension> {
+            jvmToolchain(jvmVersion)
+            compilerOptions {
+                jvmTarget.set(JvmTarget.fromTarget(jvmVersion.toString()))
+            }
+        }
+    }
+
+    // Kotlin Android
+    plugins.withId("org.jetbrains.kotlin.android") {
+        extensions.configure<KotlinAndroidProjectExtension> {
+            jvmToolchain(jvmVersion)
+            compilerOptions {
+                jvmTarget.set(JvmTarget.fromTarget(jvmVersion.toString()))
+            }
+        }
+    }
+
+    // Android (app / library)
+    plugins.withId("com.android.application") {
+        extensions.configure<ApplicationExtension> {
+            compileOptions {
+                sourceCompatibility = JavaVersion.toVersion(jvmVersion)
+                targetCompatibility = JavaVersion.toVersion(jvmVersion)
+            }
+        }
+    }
+    plugins.withId("com.android.library") {
+        extensions.configure<LibraryExtension> {
+            compileOptions {
+                sourceCompatibility = JavaVersion.toVersion(jvmVersion)
+                targetCompatibility = JavaVersion.toVersion(jvmVersion)
+            }
+        }
+    }
+}
+
 subprojects {
     apply(plugin = "org.jlleitschuh.gradle.ktlint")
     apply(plugin = "org.jetbrains.dokka")