Skip to content
Open
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
6 changes: 1 addition & 5 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ on:
pull_request:
push:
branches: [master]
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
check:
runs-on: ubuntu-24.04
Expand All @@ -21,4 +17,4 @@ jobs:
- name: Setup Android SDK
uses: android-actions/setup-android@v4
- name: Build
run: ./gradlew assembleNext
run: ./gradlew assembleDebug
4 changes: 0 additions & 4 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
schedule:
- cron: '0 0 * * *'

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
check_date:
runs-on: ubuntu-24.04
Expand Down
58 changes: 32 additions & 26 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

configurations.all {
resolutionStrategy.eachDependency {
if (requested.group == "androidx.concurrent" && requested.name == "concurrent-futures") {
useVersion("1.2.0")
because("conflict between compose BOM (1.1.0) and test deps (1.2.0)")
}
}
}

android {
compileSdk = 36
defaultConfig {
Expand All @@ -33,7 +42,6 @@ android {
addConstant("INTENT_NEW_EVENT_ACTION", "com.juick.NEW_EVENT_ACTION")

buildConfigField "boolean", "HIDE_NSFW", "false"
buildConfigField "boolean", "ENABLE_COMPOSE_UI", "false"
buildConfigField "boolean", "ENABLE_UPDATER", "true"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -42,7 +50,6 @@ android {
}
buildFeatures {
buildConfig true
viewBinding true
compose true
}
compileOptions {
Expand All @@ -66,10 +73,6 @@ android {
minifyEnabled false
signingConfig signingConfigs.release
}
next {
initWith debug
buildConfigField "boolean", "ENABLE_COMPOSE_UI", "true"
}
store {
initWith release
buildConfigField "boolean", "ENABLE_UPDATER", "false"
Expand Down Expand Up @@ -126,12 +129,11 @@ dependencies {
implementation libs.navigation.fragment.ktx
implementation libs.navigation.ui.ktx
implementation libs.savedstate.ktx
implementation libs.swiperefreshlayout
implementation libs.lifecycle.viewmodel.compose
implementation libs.lifecycle.runtime.compose
implementation libs.runtime.livedata
implementation libs.lifecycle.extensions

implementation libs.material

// Sign in with Google
googleImplementation libs.credentials.play.services.auth
googleImplementation libs.play.services.auth
Expand All @@ -148,24 +150,27 @@ dependencies {
implementation libs.retrofit
implementation libs.converter.kotlinx.serialization

implementation libs.chatkit
huaweiImplementation libs.push

implementation libs.fragmentviewbindingdelegate.kt

implementation libs.android.image.cropper

// Compose
nextImplementation libs.activity.compose
nextImplementation libs.constraintlayout.compose
nextImplementation platform(libs.compose.bom)
nextImplementation libs.ui
nextImplementation libs.ui.graphics
nextImplementation libs.ui.viewbinding
nextImplementation libs.ui.tooling.preview
nextImplementation libs.material.icons.extended
nextImplementation libs.material3
nextImplementation libs.ui.tooling
implementation libs.activity.compose
implementation libs.constraintlayout.compose
implementation platform(libs.compose.bom)
implementation libs.ui
implementation libs.ui.graphics
implementation libs.ui.tooling.preview
implementation libs.material.icons.extended
implementation libs.material3
debugImplementation libs.ui.tooling

// Navigation Compose
implementation libs.navigation.compose

// Coil for image loading
implementation libs.coil.compose
implementation libs.coil.network.okhttp
// Core library
androidTestImplementation libs.test.core.ktx

Expand All @@ -174,10 +179,11 @@ dependencies {
androidTestImplementation libs.truth

androidTestImplementation libs.espresso.core
// Espresso intents for intercepting ACTION_VIEW
androidTestImplementation libs.espresso.intents
// Fragment testing helpers (launchFragmentInContainer)
androidTestImplementation libs.fragment.testing

// Compose UI testing
androidTestImplementation(platform(libs.compose.bom))
androidTestImplementation libs.compose.ui.test.junit4
debugImplementation libs.compose.ui.test.manifest
// UI Automator
androidTestImplementation libs.uiautomator.v18
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.gradle.daemon=false
org.gradle.parallel=fasle
org.gradle.parallel=false
org.gradle.jvmargs=-Xmx1536M
org.gradle.vfs.watch=true
android.useAndroidX=true
Expand Down
20 changes: 13 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ androidImageCropper = "4.7.0"
appcompat = "1.7.1"
browser = "1.10.0"
chatkit = "5e99a8bf3c"
coil = "3.4.0"
constraintlayoutCompose = "1.1.1"
credentialsPlayServicesAuth = "1.6.0"
espressoCore = "3.6.1"
espressoIntents = "3.7.0"
espresso = "3.7.0"
firebaseBom = "34.14.1"
composeBom = "2026.05.01"
fragmentTesting = "1.8.9"
Expand All @@ -18,7 +18,7 @@ kotlinxSerializationJson = "1.11.0"
coreKtx = "1.18.0"
lifecycleVersion = "2.10.0"
lifecycleExtensions = "2.2.0"
material = "1.14.0"
material3 = "1.4.0"
navigationFragmentKtx = "2.9.8"
okhttp = "5.4.0"
oksse = "0.9.0"
Expand All @@ -41,13 +41,15 @@ android-image-cropper = { module = "com.vanniktech:android-image-cropper", versi
browser = { module = "androidx.browser:browser", version.ref = "browser" }
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
chatkit = { module = "com.github.vitalyster:ChatKit", version.ref = "chatkit" }
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayoutCompose" }
converter-kotlinx-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
credentials-play-services-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "credentialsPlayServicesAuth" }
espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espressoIntents" }
espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso" }
firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
fragment-testing = { module = "androidx.fragment:fragment-testing", version.ref = "fragmentTesting" }
Expand All @@ -56,11 +58,15 @@ googleid = { module = "com.google.android.libraries.identity.googleid:googleid",
junit = { module = "androidx.test.ext:junit", version.ref = "junit" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleVersion" }
lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleVersion" }
runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycleExtensions" }
logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
material = { module = "com.google.android.material:material", version.ref = "material" }
material3 = { module = "androidx.compose.material3:material3" }
material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationFragmentKtx" }
navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
Expand Down
2 changes: 1 addition & 1 deletion src/androidTest/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2008-2022, Juick
~ Copyright (C) 2008-2026, Juick
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as
Expand Down
103 changes: 0 additions & 103 deletions src/androidTest/java/com/juick/android/testing/ChatLinkClickTest.kt

This file was deleted.

Loading