Merge pull request #343 from hannesa2/AndroidGradle-9.0.0

Android gradle 9.0.0

Author: hannesa2

README.md

@@ -28,35 +28,50 @@ This library provides an easy way to update app with provided apk in release.
     )
   ```
 
-3. And you need repository info eg in `build.config`
-  
-    ```groovy
+3. And you need repository info eg in `build.gradle.kts`
+
+In kts you can use submodule buildSrc
+
+```kotlin
+import info.git.versionHelper.getGitCommitCount
+import info.git.versionHelper.getGitOriginRemote
+
+android {
     defaultConfig {
-      ...
-      versionCode getGitCommitCount()
-    
-      buildConfigField "String", 'GIT_REPOSITORY', "\"" + getGitRepository() + "\""
-    }
-    
-    static def getGitCommitCount() {
-      def process = "git rev-list HEAD --count".execute()
-      return process.text.toInteger()
+        versionCode = getGitCommitCount()
+        buildConfigField("String", "GIT_REPOSITORY", "\"" + getGitOriginRemote() + "\"")
     }
-    
-    static def getGitOriginRemote() {
-      def process = "git remote -v".execute()
-      def values = process.text.toString().trim().split("\\r\\n|\\n|\\r")
-    
-      def found = values.find { it.startsWith("origin") && it.endsWith("(push)") }
-      return found.replace("origin", "").replace("(push)", "").replace(".git", "").trim()
-    }
-    
-    static def getGitRepository() {
-      def token = getGitOriginRemote().split("/")
-      return token[4]
+}
+```
+eg groovy in `build.gradle`
+```groovy
+android {
+    defaultConfig {
+        ...
+        versionCode getGitCommitCount()
+
+        buildConfigField "String", 'GIT_REPOSITORY', "\"" + getGitRepository() + "\""
     }
-    ```
+}
+
+static def getGitCommitCount() {
+  def process = "git rev-list HEAD --count".execute()
+  return process.text.toInteger()
+}
+
+static def getGitOriginRemote() {
+  def process = "git remote -v".execute()
+  def values = process.text.toString().trim().split("\\r\\n|\\n|\\r")
+
+  def found = values.find { it.startsWith("origin") && it.endsWith("(push)") }
+  return found.replace("origin", "").replace("(push)", "").replace(".git", "").trim()
+}
 
+static def getGitRepository() {
+  def token = getGitOriginRemote().split("/")
+  return token[4]
+}
+```
 ## Include the library
 
 The easiest way to add `githubAppUpdate` to your project is via Gradle. Just add the following lines to your `build.gradle`:
@@ -83,7 +98,7 @@ You can specify now an optional personal access token for github. Then it works
 
 ## License
 
-    Copyright (C) 2025 hannesa2
+    Copyright (C) 2026 hannesa2
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/build.gradle

@@ -0,0 +1,58 @@
+import info.git.versionHelper.getGitCommitCount
+import info.git.versionHelper.getGitOriginRemote
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    id("com.android.application")
+}
+
+android {
+    namespace = "info.hannes.github.sample"
+    compileSdk = 36
+    defaultConfig {
+        versionCode = getGitCommitCount()
+        versionName = "1.0"
+
+        minSdk = 23
+
+        buildConfigField("String", "GIT_REPOSITORY", "\"" + getGitOriginRemote() + "\"")
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments.putAll(
+            mapOf(
+                "useTestStorageService" to "true",
+            ),
+        )
+    }
+    packaging {
+        resources {
+            pickFirsts += setOf("META-INF/atomicfu.kotlin_module")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
+    }
+
+    buildFeatures {
+        viewBinding = true
+        buildConfig = true
+    }
+}
+
+dependencies {
+    implementation(project(":githubAppUpdate"))
+    implementation("androidx.legacy:legacy-support-v4:1.0.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("com.google.android.material:material:1.13.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10")
+
+    androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
+    androidTestUtil("androidx.test.services:test-services:1.6.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+}

app/build.gradle.kts

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.13.0")
+        classpath("com.android.tools.build:gradle:9.0.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10")
     }
 }

build.gradle.kts

@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.library")
-    id("kotlin-android")
     id("maven-publish")
 }
 

githubAppUpdate/build.gradle.kts

@@ -0,0 +1,33 @@
+# Keep Kotlin metadata for coroutines
+-keep class kotlin.Metadata { *; }
+-keepattributes RuntimeVisibleAnnotations
+-keepattributes *Annotation*
+
+# Keep coroutine related classes
+-keepclassmembernames class kotlinx.** {
+    volatile <fields>;
+}
+
+# Preserve Kotlin coroutine internal structures
+-keep class kotlin.coroutines.** { *; }
+-keep class kotlinx.coroutines.** { *; }
+
+# Don't obfuscate Kotlin metadata
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
+
+# Keep synthetic methods for Kotlin coroutines
+-keepclassmembers class ** {
+    synthetic <methods>;
+}
+
+# Preserve function types
+-keep class kotlin.jvm.functions.** { *; }
+
+# Don't warn about R8 issues with Kotlin metadata
+-dontwarn kotlin.Metadata
+-dontwarn kotlinx.coroutines.**
+
+# Keep lifecycle coroutine scope
+-keep class androidx.lifecycle.** { *; }
+-keepclassmembers class androidx.lifecycle.** { *; }