Compare commits

4 Commits

Author SHA1 Message Date
c301d5aab7 chore: update target sdk to 36 2025-08-19 17:48:54 +08:00
2c673280cc chore: update jdk to 21 2025-08-19 17:48:32 +08:00
036a3f90e9 chore: bump gradle to 8.14.3 2025-08-19 17:48:24 +08:00
5b6caf4769 chore: bump dependencies 2025-08-19 17:48:15 +08:00
9 changed files with 33 additions and 34 deletions

View File

@@ -39,10 +39,10 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1 uses: jwlawson/actions-setup-cmake@v1
with: with:
cmake-version: '3.22.1' cmake-version: '3.22.1'
- name: Prepare Java 17 - name: Prepare Java 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 17 java-version: 21
java-package: jdk java-package: jdk
distribution: 'temurin' distribution: 'temurin'
cache: 'gradle' cache: 'gradle'

View File

@@ -28,10 +28,10 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1 uses: jwlawson/actions-setup-cmake@v1
with: with:
cmake-version: '3.22.1' cmake-version: '3.22.1'
- name: Prepare Java 17 - name: Prepare Java 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 17 java-version: 21
java-package: jdk java-package: jdk
distribution: 'temurin' distribution: 'temurin'
cache: 'gradle' cache: 'gradle'

View File

@@ -1,5 +1,21 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins { plugins {
autowire(libs.plugins.android.application) apply false autowire(libs.plugins.android.application) apply false
autowire(libs.plugins.kotlin.android) apply false autowire(libs.plugins.kotlin.android) apply false
autowire(libs.plugins.kotlin.ksp) apply false autowire(libs.plugins.kotlin.ksp) apply false
}
allprojects {
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget = JvmTarget.JVM_17
freeCompilerArgs.addAll(
"-Xno-param-assertions",
"-Xno-call-assertions",
"-Xno-receiver-assertions"
)
}
}
} }

View File

@@ -43,14 +43,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
} }
kotlinOptions {
jvmTarget = "17"
freeCompilerArgs = listOf(
"-Xno-param-assertions",
"-Xno-call-assertions",
"-Xno-receiver-assertions"
)
}
buildFeatures { buildFeatures {
buildConfig = true buildConfig = true
viewBinding = true viewBinding = true

View File

@@ -3,12 +3,11 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true android.useAndroidX=true
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
kotlin.code.style=official kotlin.code.style=official
kotlin.incremental.useClasspathSnapshot=true
# Project Configuration # Project Configuration
project.name=AppErrorsTracking project.name=AppErrorsTracking
project.android.compileSdk=35 project.android.compileSdk=36
project.android.minSdk=24 project.android.minSdk=24
project.android.targetSdk=35 project.android.targetSdk=36
project.android.ndk.version="24.0.8215888" project.android.ndk.version="24.0.8215888"
project.android.cmake.version="3.22.1" project.android.cmake.version="3.22.1"
project.module-app.packageName=com.fankes.apperrorstracking project.module-app.packageName=com.fankes.apperrorstracking

View File

@@ -22,16 +22,16 @@ repositories:
plugins: plugins:
com.android.application: com.android.application:
alias: android-application alias: android-application
version: 8.9.3 version: 8.12.1
org.jetbrains.kotlin.android: org.jetbrains.kotlin.android:
alias: kotlin-android alias: kotlin-android
version: 2.1.10 version: 2.2.10
com.highcapable.flexilocale: com.highcapable.flexilocale:
alias: flexi-locale alias: flexi-locale
version: 1.0.1 version: 1.0.2
com.google.devtools.ksp: com.google.devtools.ksp:
alias: kotlin-ksp alias: kotlin-ksp
version: 2.1.10-1.0.31 version: 2.2.10-2.0.2
libraries: libraries:
com.fankes.projectpromote: com.fankes.projectpromote:
@@ -68,13 +68,13 @@ libraries:
version: 1.0.7 version: 1.0.7
com.google.code.gson: com.google.code.gson:
gson: gson:
version: 2.12.1 version: 2.13.1
com.squareup.okhttp3: com.squareup.okhttp3:
okhttp: okhttp:
version: 5.0.0-alpha.16 version: 5.1.0
androidx.core: androidx.core:
core-ktx: core-ktx:
version: 1.16.0 version: 1.17.0
androidx.appcompat: androidx.appcompat:
appcompat: appcompat:
version: 1.7.1 version: 1.7.1
@@ -86,10 +86,10 @@ libraries:
version: 2.2.1 version: 2.2.1
androidx.test.ext: androidx.test.ext:
junit: junit:
version: 1.2.1 version: 1.3.0
androidx.test.espresso: androidx.test.espresso:
espresso-core: espresso-core:
version: 3.6.1 version: 3.7.0
junit: junit:
junit: junit:
version: 4.13.2 version: 4.13.2

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

View File

@@ -39,14 +39,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
} }
kotlinOptions {
jvmTarget = "17"
freeCompilerArgs = listOf(
"-Xno-param-assertions",
"-Xno-call-assertions",
"-Xno-receiver-assertions"
)
}
buildFeatures { buildFeatures {
buildConfig = true buildConfig = true
viewBinding = true viewBinding = true

View File

@@ -7,7 +7,7 @@ pluginManagement {
} }
plugins { plugins {
id("com.highcapable.sweetdependency") version "1.0.4" id("com.highcapable.sweetdependency") version "1.0.4"
id("com.highcapable.sweetproperty") version "1.0.5" id("com.highcapable.sweetproperty") version "1.0.8"
} }
sweetProperty { sweetProperty {
global { global {