mirror of
https://github.com/fankes/TSBattery.git
synced 2025-09-05 18:25:22 +08:00
Compare commits
4 Commits
53249108d1
...
d39f50642a
Author | SHA1 | Date | |
---|---|---|---|
d39f50642a
|
|||
5a6a61b4be
|
|||
114ec89764
|
|||
476b6d6be6
|
4
.github/workflows/commit_ci.yml
vendored
4
.github/workflows/commit_ci.yml
vendored
@@ -37,10 +37,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'
|
||||||
|
4
.github/workflows/pull_request_ci.yml
vendored
4
.github/workflows/pull_request_ci.yml
vendored
@@ -27,10 +27,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'
|
||||||
|
@@ -38,14 +38,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
|
||||||
|
@@ -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"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@@ -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=TSBattery
|
project.name=TSBattery
|
||||||
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.app.packageName=com.fankes.tsbattery
|
project.app.packageName=com.fankes.tsbattery
|
||||||
project.app.versionName="4.4"
|
project.app.versionName="4.4"
|
||||||
project.app.versionCode=30
|
project.app.versionCode=30
|
||||||
|
@@ -22,13 +22,13 @@ 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.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:
|
||||||
@@ -70,10 +70,10 @@ libraries:
|
|||||||
version: 1.0.7
|
version: 1.0.7
|
||||||
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
|
||||||
@@ -85,10 +85,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
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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
|
@@ -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 {
|
||||||
|
Reference in New Issue
Block a user