FatttSnake/OxygenToolbox
1
0
Fork 0
mirror of https://github.com/FatttSnake/OxygenToolbox.git synced 2026-04-06 05:41:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated gradle to 8.0. Updated jdk to 17. Updated compileSdk and targetSdk to 32.

Browse Source
This commit is contained in:
Fat Snake
2023-05-25 19:55:33 +08:00
parent 0e5567a072
commit b40d0db419
9 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="17" />
</component> </component>
</project> </project>

17
.idea/deploymentTargetDropDown.xml generated Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="adb-a9f1bb3a-moNgbH._adb-tls-connect._tcp" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-05-25T11:05:17.858229300Z" />
</component>
</project>

2
.idea/misc.xml generated
View File

@@ -119,7 +119,7 @@
</map> </map>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

3
app/.gitignore vendored
View File

@@ -1 +1,2 @@
/build /build
/src/main/res/raw/dependencies.json

38
app/build.gradle
View File

@@ -4,12 +4,12 @@ plugins {
} }
android { android {
compileSdk 32 compileSdk 33
defaultConfig { defaultConfig {
applicationId "com.fatapp.oxygentoolbox" applicationId "com.fatapp.oxygentoolbox"
minSdk 21 minSdk 21
targetSdk 32 targetSdk 33
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@@ -46,16 +46,16 @@ android {
android.applicationVariants.all { android.applicationVariants.all {
variant -> variant ->
variant.outputs.all { variant.outputs.all {
output -> outputFileName = new File(variant.name, "OxygenToolbox" + "_" + defaultConfig.versionName + "-" + defaultConfig.versionCode + "_" + buildType.name + ".apk") output -> outputFileName = "OxygenToolbox" + "_" + defaultConfig.versionName + "-" + defaultConfig.versionCode + "_" + buildType.name + ".apk"
} }
} }
compileOptions { compileOptions {
// Flag to enable support for the new language APIs // Flag to enable support for the new language APIs
coreLibraryDesugaringEnabled true coreLibraryDesugaringEnabled true
// Sets Java compatibility to Java 8 // Sets Java compatibility to Java 17
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_17
} }
buildFeatures { buildFeatures {
@@ -90,25 +90,27 @@ task exportLibrariesToJson(group: 'build', description: 'Generate libraries defi
} }
afterEvaluate { afterEvaluate {
def assembleTask = tasks.findByName("assembleDebug") tasks.findByName("assembleDebug").dependsOn(exportLibrariesToJson)
assembleTask.dependsOn(exportLibrariesToJson) tasks.findByName("mergeDebugResources").dependsOn(exportLibrariesToJson)
tasks.findByName("packageDebugResources").dependsOn(exportLibrariesToJson)
tasks.findByName("mapDebugSourceSetPaths").dependsOn(exportLibrariesToJson)
} }
dependencies { dependencies {
//noinspection GradleDependency //noinspection GradleDependency
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.preference:preference:1.2.0'
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2' implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.5.2' implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
implementation 'androidx.core:core-splashscreen:1.0.0' implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.github.KilleTom:BangScreenToolsMaster:v1.0.0' implementation 'com.github.KilleTom:BangScreenToolsMaster:v1.0.0'
implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
} }

1
app/src/main/res/raw/dependencies.json
View File

File diff suppressed because one or more lines are too long

6
build.gradle
View File

@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id 'com.android.application' version '7.3.1' apply false id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '7.3.1' apply false id 'com.android.library' version '8.0.2' apply false
id 'com.mikepenz.aboutlibraries.plugin' version '10.3.1' apply false id 'com.mikepenz.aboutlibraries.plugin' version '10.7.0' apply false
} }
task clean(type: Delete) { task clean(type: Delete) {

4
gradle.properties
View File

@@ -19,4 +19,6 @@ android.enableJetifier=true
# Enables namespacing of each library's R class so that its R class includes only the # 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, # resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library # thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Sat Jul 16 00:05:06 CST 2022 #Sat Jul 16 00:05:06 CST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME