diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 6fe52a2..ac0a902 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -42,17 +42,20 @@ jobs: fi - name: Decode keystore + if: steps.stop.outputs.continue == 'true' run: | - mkdir -p app - echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > app/release.keystore + echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > release.keystore - name: Check keystore + if: steps.stop.outputs.continue == 'true' run: ls -l app/ - name: Make Gradlew executable + if: steps.stop.outputs.continue == 'true' run: chmod +x ./gradlew - name: Set up Android SDK + if: steps.stop.outputs.continue == 'true' run: | mkdir -p $HOME/Android/sdk/cmdline-tools wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O cmdline-tools.zip @@ -78,7 +81,7 @@ jobs: run: | VERSION=$(cat version.txt) ./gradlew assembleRelease \ - -Pandroid.injected.signing.store.file=app/release.keystore \ + -Pandroid.injected.signing.store.file=release.keystore \ -Pandroid.injected.signing.store.password=$KEYSTORE_PASSWORD \ -Pandroid.injected.signing.key.alias=$KEY_ALIAS \ -Pandroid.injected.signing.key.password=$KEY_PASSWORD diff --git a/app/build.gradle b/app/build.gradle index fa17874..f15829d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,8 @@ -plugins { - alias(libs.plugins.android.application) -} +plugins { alias(libs.plugins.android.application) } android { namespace 'com.anabasis.vkchatmanager' - compileSdk { - version = release(36) - } + compileSdk 36 defaultConfig { applicationId "com.anabasis.vkchatmanager" @@ -18,24 +14,26 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + signingConfigs { + release { + // путь от корня проекта (там где gradlew) + storeFile file("release.keystore") + storePassword System.getenv("KEYSTORE_PASSWORD") ?: "change_me" + keyAlias System.getenv("KEY_ALIAS") ?: "change_me" + keyPassword System.getenv("KEY_PASSWORD") ?: "change_me" + } + } + buildTypes { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } + compileOptions { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } } - -dependencies { - - implementation libs.recyclerview - implementation libs.viewpager2 - implementation libs.material - implementation libs.swiperefreshlayout - implementation libs.okhttp - implementation libs.json -}