Fix ci

Author: mdrlzy

.github/workflows/build.yml

@@ -0,0 +1,83 @@
+name: Build the app
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+env:
+  BRANCH_NAME: ${{ github.ref_name }}
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+jobs:
+  check:
+    if: ${{ startsWith(github.actor, 'dependabot') }}
+    environment: Development
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+
+      - name: Build debug APK
+        run: ./gradlew assembleDebug
+
+  build:
+    environment: Development
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+
+      - name: Decrypt the keystore for signing
+        run: |
+          echo "${{ secrets.KEYSTORE_ENCRYPTED }}" > keystore.asc
+          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.asc > keystore.jks
+
+      - name: Build release APK
+        run: ./gradlew assembleRelease
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-release
+          path: ./app/build/outputs/apk/release/app-release.apk
+  lint:
+    needs: build
+    environment: Development
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Run linter
+        run: ./gradlew lint
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: lint-results
+          path: ./app/build/reports/*.html

.github/workflows/build_apk.yml

@@ -1,15 +1,3 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
-import java.util.Properties
-
-val localProps = Properties().apply {
-    file("$rootDir/local.properties").takeIf { it.exists() }?.inputStream()?.use { load(it) }
-}
-fun localProp(key: String): String? = localProps.getProperty(key)
-val devKeystorePath = "${layout.buildDirectory.asFile.get().absolutePath}/drop-keystore.jks"
-val devKeystorePassword = localProp("dev.keystore.password") ?: "defaultPassword123"
-val devKeyAlias = "drop-key"
-val devDname = localProp("dev.keystore.dname") ?: "CN=Unknown, OU=Dev, O=Unknown, L=City, ST=State, C=XX"
-
 plugins {
     kotlin("kapt") version "2.2.0"
     kotlin("plugin.serialization") version "1.9.23"
@@ -37,13 +25,13 @@ android {
         applicationId = "dev.arkbuilders.drop.app"
         minSdk = 29
         targetSdk = 36
-        versionCode = getVersionCode()
-        versionName = getVersionName()
+        versionCode = 1
+        versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        // Play Store metadata
-        setProperty("archivesBaseName", "drop-v$versionName")
+
+        setProperty("archivesBaseName", "ark-drop")
     }
 
     buildTypes {
@@ -113,13 +101,6 @@ android {
     }
 }
 
-play {
-    serviceAccountCredentials.set(file("play-store-credentials.json"))
-    track.set("internal") // Start with internal testing
-    releaseStatus.set(com.github.triplet.gradle.androidpublisher.ReleaseStatus.DRAFT)
-    defaultToAppBundles.set(true)
-}
-
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -196,55 +177,7 @@ kapt {
     correctErrorTypes = true
 }
 
-fun getVersionCode(): Int {
-    val versionCode = System.getenv("VERSION_CODE")?.toIntOrNull()
-    return versionCode ?: (System.currentTimeMillis() / 1000).toInt()
-}
-
-fun getVersionName(): String {
-    val versionName = System.getenv("VERSION_NAME")
-    return versionName ?: "1.0.0"
-}
-
 tasks.named<Delete>("clean") {
     delete(fileTree("$projectDir/src/main/jniLibs"))
 }
 
-tasks.register<Exec>("generateDevKeystore") {
-    doFirst {
-        mkdir(layout.buildDirectory)
-    }
-    val keystoreFile = file(devKeystorePath)
-    commandLine = if (keystoreFile.exists()) {
-        listOf("echo", "\"Development keystore already exists.\"")
-    } else {
-        listOf(
-            "keytool", "-genkeypair",
-            "-alias", devKeyAlias,
-            "-keyalg", "RSA",
-            "-keysize", "2048",
-            "-validity", "10000",
-            "-keystore", devKeystorePath,
-            "-storepass", devKeystorePassword,
-            "-keypass", devKeystorePassword,
-            "-dname", devDname
-        )
-    }
-}
-
-tasks.named("preBuild").dependsOn("generateDevKeystore")
-
-// Task to generate release notes
-tasks.register("generateReleaseNotes") {
-    doLast {
-        val releaseNotesFile = file("fastlane/metadata/android/en-US/changelogs/${getVersionCode()}.txt")
-        releaseNotesFile.parentFile.mkdirs()
-        releaseNotesFile.writeText("""
-            • Initial release of Drop
-            • Secure file sharing between devices
-            • Profile management with custom avatars
-            • Transfer history tracking
-            • QR code sharing for easy connections
-        """.trimIndent())
-    }
-}