这是indexloc提供的服务，不要输入任何密码
Skip to content

refactor(build): remove dynamic version calculation from build script… #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

refactor(build): remove dynamic version calculation from build script… #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ jobs:
keyPassword: ${{ secrets.KEY_PASSWORD }}
- name: Set version from properties
run: |
majorVersion=$(grep 'majorVersion=' gradle.properties | cut -d'=' -f2)
minorVersion=$(grep 'minorVersion=' gradle.properties | cut -d'=' -f2)
patchVersion=$(grep 'patchVersion=' gradle.properties | cut -d'=' -f2)
version="${majorVersion}.${minorVersion}.${patchVersion}"
version=$(grep 'versionName = ' app/build.gradle.kts | awk -F'"' '{print $2}')
echo "RELEASE_VERSION=$version" >> "$GITHUB_ENV"
- name: Publish release.
if: success()
Expand Down
19 changes: 2 additions & 17 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,15 @@ plugins {
id(libs.plugins.spotless.get().pluginId)
}

/**
* read version from gradle.properties
*/
val majorVersion by properties
val minorVersion by properties
val patchVersion by properties

fun getVersionCode(): Int {
return (majorVersion as String).toInt() * 10000 + (minorVersion as String).toInt() * 100 + (patchVersion as String).toInt()
}

fun getVersionName(): String {
return "$majorVersion.$minorVersion.$patchVersion"
}

android {
compileSdk = (Apps.compileSdk)
buildToolsVersion = (Apps.buildTools)
defaultConfig {
applicationId = "me.rosuh.easywatermark"
minSdk = (Apps.minSdk)
targetSdk = (Apps.targetSdk)
versionCode = getVersionCode()
versionName = getVersionName()
versionCode = 20905
versionName = "2.9.5"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
6 changes: 1 addition & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,4 @@ org.gradle.unsafe.configuration-cache=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
#org.gradle.unsafe.configuration-cache=true

majorVersion=2
minorVersion=9
patchVersion=5
#org.gradle.unsafe.configuration-cache=true
Loading