-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade targetSdk and compileSdk to 34
- Loading branch information
Showing
7 changed files
with
100 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,35 @@ | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| compileSdkVersion 32 | ||
| compileSdk 34 | ||
| defaultConfig { | ||
| applicationId "com.ex.serialport" | ||
| minSdkVersion 14 | ||
| targetSdkVersion 32 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
|
|
||
| minSdk 14 | ||
| targetSdk 34 | ||
| versionCode gitVersionCode | ||
| versionName gitVersionName | ||
| } | ||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| minifyEnabled true | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| android.applicationVariants.configureEach { variant -> | ||
| variant.outputs.configureEach { output -> | ||
| def fileName = "AndroidSerialportSample-${defaultConfig.versionCode}_${defaultConfig.versionName}.apk" | ||
| outputFileName = fileName | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation fileTree(include: ['*.jar'], dir: 'libs') | ||
| implementation 'androidx.appcompat:appcompat:1.4.2' | ||
| implementation 'androidx.appcompat:appcompat:1.6.1' | ||
| implementation 'androidx.constraintlayout:constraintlayout:2.1.4' | ||
| implementation 'androidx.recyclerview:recyclerview:1.2.1' | ||
| implementation 'androidx.recyclerview:recyclerview:1.3.1' | ||
| implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.7' | ||
| implementation project(path: ':serialport') | ||
| // implementation 'io.github.xmaihh:serialport:2.1.1' | ||
| // implementation 'io.github.xmaihh:serialport:2.1.2' | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,44 @@ | ||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
|
|
||
| buildscript { | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| google() | ||
| mavenCentral() | ||
| maven { url 'https://jitpack.io' } | ||
| gradlePluginPortal() | ||
| maven { | ||
| url = uri("https://plugins.gradle.org/m2/") | ||
| } | ||
| maven { url = uri("https://jitpack.io") } | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:7.2.1' | ||
| classpath 'com.android.tools.build:gradle:7.4.2' | ||
| // NOTE: Do not place your application dependencies here; they belong | ||
| // in the individual module build.gradle files | ||
| classpath 'org.ajoberstar.grgit:grgit-gradle:5.2.0' | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| mavenLocal() | ||
| google() | ||
| mavenCentral() | ||
| maven { url 'https://jitpack.io' } | ||
| gradlePluginPortal() | ||
| maven { | ||
| url = uri("https://plugins.gradle.org/m2/") | ||
| } | ||
| maven { url = uri("https://jitpack.io") } | ||
| } | ||
| } | ||
|
|
||
| task clean(type: Delete) { | ||
| delete rootProject.buildDir | ||
| } | ||
|
|
||
| ext { | ||
| Grgit = org.ajoberstar.grgit.Grgit | ||
| } | ||
|
|
||
| apply from: 'versions.gradle' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Tue Jun 21 10:59:24 CST 2022 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip | ||
| distributionPath=wrapper/dists | ||
| zipStorePath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| ext { | ||
| git = rootProject.ext.Grgit.open(currentDir: projectDir) | ||
| gitBranchName = git.branch.current().name | ||
| gitVersionName = git.describe(tags: true) | ||
| gitVersionCode = git.tag.list().size() | ||
| gitVersionCodeTime = git.head().dateTime.toEpochSecond().intValue() | ||
|
|
||
| task printVersion() { | ||
| println("Version Name: $gitVersionName") | ||
| println("Version Code: $gitVersionCode") | ||
| println("Version Code Time: $gitVersionCodeTime") | ||
| } | ||
| } | ||
|
|
||
| def buildTime() { | ||
| def date = new Date() | ||
| def formattedDate = date.format('yyyyMMdd_HHmm') | ||
| return formattedDate | ||
| } | ||
|
|
||
| ext.gitBranchName = { | ||
| def branch = "" | ||
| def proc = "git rev-parse --abbrev-ref HEAD".execute() | ||
| proc.in.eachLine { line -> branch = line } | ||
| proc.err.eachLine { line -> println line } | ||
| proc.waitFor() | ||
| return branch | ||
| } | ||
|
|
||
| ext.getGitHeadRefsSuffix = { | ||
| try { | ||
| def headFile = new File(rootDir.getParent(), '.git/HEAD') | ||
| if (headFile.exists()) { | ||
| String[] strings = headFile.getText('UTF-8').split(" ") | ||
| if (strings.size() > 1) { | ||
| def refHeadFile = new File(rootDir.getParent(), '.git/' + strings[1]) | ||
| String refFilePath = refHeadFile.getPath() | ||
| def refFile = new File(refFilePath.replace("\n", "")) | ||
| return refFile.getText('UTF-8').substring(0, 7) | ||
| } | ||
| } else { | ||
| return "headFile" | ||
| } | ||
| } catch (Exception e) { | ||
| logger.log(LogLevel.ERROR, e.getMessage()) | ||
| return "error" | ||
| } | ||
| return "default_version" | ||
| } |