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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ The User Page can be used to edit your profile, avatar, and execute server actio

If you are having trouble using the app, support is available via [GitHub](#support) or [Discord](https://discord.gg/wXy6m2X8wY).

[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/)
[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/faq)

## Screenshots

Expand Down Expand Up @@ -196,7 +196,7 @@ A slideshow is available [on the website](https://zipline-android.cssnr.com/guid

## Support

[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/faq)
[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/support)

For general help or to request a feature, see:

Expand Down Expand Up @@ -317,7 +317,7 @@ If you would like to submit a PR, please review the [CONTRIBUTING.md](#contribut

[![Screenshot](https://raw.githubusercontent.com/smashedr/repo-images/refs/heads/master/zipline/extension/screenshot.jpg)](https://github.com/cssnr/zipline-extension?tab=readme-ov-file#readme)

- [Zipline CLI](https://github.com/cssnr/zipline-cli?tab=readme-ov-file#readme) - _Only Supports v3_
- [Zipline CLI](https://github.com/cssnr/zipline-cli?tab=readme-ov-file#readme)

### Related Projects

Expand Down
6 changes: 3 additions & 3 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Security

[![Report a Vulnerability](https://img.shields.io/badge/Report_a_Vulnerability-34A853?style=for-the-badge)](https://github.com/cssnr/zipline-android/security/advisories/new)

We take security seriously. Please let us know if you find any vulnerabilities.

> [!WARNING]
> **Do not report security vulnerabilities through public issues, discussions, or pull requests.**

[![Report a Vulnerability](https://img.shields.io/badge/Report_a_Vulnerability-34A853?style=for-the-badge&logo=googledocs&logoColor=white)](https://github.com/cssnr/zipline-android/security/advisories/new)

## Supported Versions

Only the [latest version](https://github.com/cssnr/zipline-android/releases/latest) is supported.
Expand All @@ -17,7 +17,7 @@ Only the [latest version](https://github.com/cssnr/zipline-android/releases/late

To report a security vulnerability, [click here](https://github.com/cssnr/zipline-android/security/advisories/new).

[![Report a Vulnerability](https://img.shields.io/badge/Report_a_Vulnerability-34A853?style=for-the-badge)](https://github.com/cssnr/zipline-android/security/advisories/new)
[![Report a Vulnerability](https://img.shields.io/badge/Report_a_Vulnerability-34A853?style=for-the-badge&logo=googledocs&logoColor=white)](https://github.com/cssnr/zipline-android/security/advisories/new)

---

Expand Down
15 changes: 4 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import com.android.build.api.dsl.ApplicationExtension
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.google.services)
alias(libs.plugins.firebase.crashlytics)
alias(libs.plugins.kotlin.parcelize)
}

android {
configure<ApplicationExtension> {
namespace = "org.cssnr.zipline"
compileSdk = 36

Expand Down Expand Up @@ -48,21 +47,15 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
//kotlinOptions {
// jvmTarget = "17"
//}
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

buildFeatures {
viewBinding = true
buildConfig = true
}
}

kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) } }

dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/cssnr/zipline/db/ServerDao.kt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ interface ServerDao {
}


@Database(entities = [ServerEntity::class], version = 2)
@Database(entities = [ServerEntity::class], version = 2, exportSchema = false)
abstract class ServerDatabase : RoomDatabase() {
abstract fun serverDao(): ServerDao

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Zipline</string>
<string name="version_string">v%s</string>
<string name="version_code_string">%s (%s)</string>
<string name="version_code_string">%1$s (%2$s)</string>
<string name="welcome_username">Welcome, %s</string>
<string name="setup_zipline_text">Enter your <![CDATA[<a href="https://github.com/diced/zipline">Zipline v4 Server</a>]]> Details.</string>

Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
android.uniquePackageNames=false
android.dependency.useConstraints=false
android.r8.strictFullModeForKeepRules=false
33 changes: 16 additions & 17 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
[versions]
agp = "8.13.0"
kotlin = "2.2.21"
ksp = "2.2.21-2.0.4"
agp = "9.0.1"
kotlin = "2.3.10"
ksp = "2.3.5"
coreKtx = "1.17.0"
junit = "4.13.2"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
appcompat = "1.7.1"
material = "1.13.0"

activity = "1.11.0"
activity = "1.12.4"
preferenceKtx = "1.2.1"
lifecycleLivedataKtx = "2.9.4"
lifecycleViewmodelKtx = "2.9.4"
navigationFragmentKtx = "2.9.6"
navigationUiKtx = "2.9.6"
workRuntimeKtx = "2.11.0"
swiperefreshlayout = "1.1.0"
webkit = "1.14.0"
room = "2.8.3"
media3 = "1.8.0"
lifecycleLivedataKtx = "2.10.0"
lifecycleViewmodelKtx = "2.10.0"
navigationFragmentKtx = "2.9.7"
navigationUiKtx = "2.9.7"
workRuntimeKtx = "2.11.1"
swiperefreshlayout = "1.2.0"
webkit = "1.15.0"
room = "2.8.4"
media3 = "1.9.2"

googleServices = "4.4.4"
firebaseBom = "34.5.0"
firebaseBom = "34.9.0"
crashlyticsPlugin = "3.0.6"

okhttp = "5.3.0"
okhttp = "5.3.2"
retrofit = "3.0.0"
moshiKotlinCodegen = "1.15.2"
glide = "5.0.5"
taptargetview = "1.15.0"
konfettiXml = "2.0.5"
photoview = "1.0.3"
androidImageCropper = "4.6.0"
androidImageCropper = "4.7.0"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand Down Expand Up @@ -79,5 +79,4 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlyticsPlugin" }

kotlin-parcelize = { id = "kotlin-parcelize" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Apr 07 23:08:29 PDT 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading