Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions .github/workflows/release_beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
api-level: [ 34 ]
target: [ android-34 ]
api-level: [ 35 ]
target: [ android-35 ]
java-version: [ '21' ]
build-tools: [ '31.0.0' ]
build-tools: [ '29.0.3' ]

steps:
# Checkout code
Expand All @@ -31,6 +31,11 @@ jobs:
- name: Set up Android SDK
uses: android-actions/setup-android@v3

# Ensure required build tools are installed
- name: Install Android Build Tools
run: |
sdkmanager "build-tools;29.0.3"

# Set up Gradle
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3
Expand All @@ -54,7 +59,7 @@ jobs:
GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
run: echo $GOOGLE_SERVICES | base64 -di > app/google-services.json

# Create google-services.json
# Create codemonk_service_key.json
- name: Create codemonk_service_key.json
env:
SERVICE_KEY: ${{ secrets.SERVICE_KEY }}
Expand All @@ -68,15 +73,15 @@ jobs:

# Sign APK
- name: Sign APK
uses: ilharp/sign-android-release@nightly
uses: r0adkll/sign-android-release@v1
with:
releaseDir: app/build/outputs/apk/release
signingKey: ${{ secrets.KEY_STORE }}
keyAlias: ${{ secrets.KEY_STORE_ALIAS }}
releaseDirectory: app/build/outputs/apk/release
signingKeyBase64: ${{ secrets.KEY_STORE }}
alias: ${{ secrets.KEY_STORE_ALIAS }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_STORE_PASSWORD }}

# Run tests
# Run tests
- name: Run tests
run: ./gradlew testReleaseUnitTest

Expand Down Expand Up @@ -107,7 +112,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.TOKEN }}

# Increment rc version
- name: Bump version
- name: Bump version
uses: action-pack/increment@v2
id: increment
with:
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/release_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
api-level: [ 34 ]
target: [ android-34 ]
api-level: [ 35 ]
target: [ android-35 ]
java-version: [ '21' ]
build-tools: [ '31.0.0' ]
build-tools: [ '29.0.3' ]

steps:
# Checkout code
Expand All @@ -31,6 +31,11 @@ jobs:
- name: Set up Android SDK
uses: android-actions/setup-android@v3

# Ensure required build tools are installed
- name: Install Android Build Tools
run: |
sdkmanager "build-tools;29.0.3"

# Set up Gradle
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3
Expand All @@ -54,7 +59,7 @@ jobs:
GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
run: echo $GOOGLE_SERVICES | base64 -di > app/google-services.json

# Create google-services.json
# Create codemonk_service_key.json
- name: Create codemonk_service_key.json
env:
SERVICE_KEY: ${{ secrets.SERVICE_KEY }}
Expand All @@ -66,13 +71,13 @@ jobs:
- name: Build APK
run: ./gradlew assembleRelease

# Sign APK
# Sign APK
- name: Sign APK
uses: ilharp/sign-android-release@nightly
uses: r0adkll/sign-android-release@v1
with:
releaseDir: app/build/outputs/apk/release
signingKey: ${{ secrets.KEY_STORE }}
keyAlias: ${{ secrets.KEY_STORE_ALIAS }}
releaseDirectory: app/build/outputs/apk/release
signingKeyBase64: ${{ secrets.KEY_STORE }}
alias: ${{ secrets.KEY_STORE_ALIAS }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_STORE_PASSWORD }}

Expand Down
2 changes: 1 addition & 1 deletion .idea/copyright/CodeMonkProfile.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand All @@ -13,9 +13,9 @@

import AndroidConfig.COMPILE_SDK
import AndroidConfig.JAVA_VERSION
import AndroidConfig.JVM_TARGET
import AndroidConfig.MIN_SDK
import AndroidConfig.TARGET_SDK
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
Expand All @@ -34,8 +34,8 @@ android {
applicationId = "com.mca.codemonk"
minSdk = MIN_SDK
targetSdk = TARGET_SDK
versionCode = 15
versionName = "1.0.2"
versionCode = 16
versionName = "1.0.3"

testInstrumentationRunner = "com.mca.codemonk.HiltRunner"
vectorDrawables {
Expand Down Expand Up @@ -66,8 +66,10 @@ android {
sourceCompatibility = JAVA_VERSION
targetCompatibility = JAVA_VERSION
}
kotlinOptions {
jvmTarget = JVM_TARGET
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
}
}
buildFeatures {
compose = true
Expand All @@ -76,6 +78,7 @@ android {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
excludes += "META-INF/DEPENDENCIES"
excludes += "META-INF/INDEX.LIST"
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
-keep class com.mca.util.model.* { *; }
-keep class * extends com.google.firebase.database.GenericTypeIndicator { *; }

# Suppress SLF4J missing class warnings used by Google Auth/gRPC
-dontwarn org.slf4j.**
-dontwarn com.google.auth.oauth2.Slf4jUtils
-dontwarn com.google.auth.oauth2.Slf4jLoggingHelpers

# Keep Google API classes
-keep class com.google.** { *; }

Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/mca/TestUtil.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/mca/codemonk/HiltRunner.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
6 changes: 1 addition & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ Copyright © 2025 Prasidh Gopal Anchan
~ Copyright © 2026 Prasidh Gopal Anchan
~
~ Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
~ You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,10 +35,6 @@
<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="ca-app-pub-9435468330305884~5307748797" />
<property
android:name="android.adservices.AD_SERVICES_CONFIG"
android:resource="@xml/ga_ad_services_config"
tools:replace="android:resource" />

<activity
android:name=".MainActivity"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mca/codemonk/CodeMonkApplication.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mca/codemonk/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mca/codemonk/di/AppModule.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/mca/codemonk/navigation/InnerScreen.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,7 +28,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.core.content.ContextCompat
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.NavHost
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2025 Prasidh Gopal Anchan
* Copyright © 2026 Prasidh Gopal Anchan
*
* Licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* You may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@ import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.rememberNavController
Expand Down
Loading
Loading