From 75972744cb9786a2725f9bd02aecfa800d8606d2 Mon Sep 17 00:00:00 2001 From: Renan LE CARO Date: Wed, 2 Apr 2025 17:46:34 +0200 Subject: [PATCH] Build 29060146 --- app/build.gradle.kts | 49 +++++++++++++--------------------- app/src/main/assets/index.html | 2 +- build.sh | 3 +++ deploy.sh | 1 + dist/index.html | 2 +- src/PWA/sw-b71.js | 2 +- src/data/version.json | 2 +- 7 files changed, 26 insertions(+), 35 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4f9ac3f..351dcd6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,21 +1,27 @@ +import java.util.Properties +import java.io.FileInputStream + plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.jetbrainsKotlinAndroid) } -def keystorePropertiesFile = rootProject.file("keystore.properties") -def keystoreProperties = new Properties() -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + +val keystorePropertiesFile = rootProject.file("keystore.properties") +val keystoreProperties = Properties() +keystoreProperties.load(FileInputStream(keystorePropertiesFile)) + android { - signingConfigs { - config { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] + signingConfigs { + create("release") { + keyAlias = keystoreProperties["keyAlias"] as String + keyPassword = keystoreProperties["keyPassword"] as String + storeFile = file(keystoreProperties["storeFile"] as String) + storePassword = keystoreProperties["storePassword"] as String } } + namespace = "me.lecaro.breakout" compileSdk = 34 @@ -23,8 +29,8 @@ android { applicationId = "me.lecaro.breakout" minSdk = 21 targetSdk = 34 - versionCode = 29060103 - versionName = "29060103" + versionCode = 29060146 + versionName = "29060146" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true @@ -39,7 +45,7 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) - signingConfig = signingConfigs.getByName("debug") + signingConfig = signingConfigs.getByName("release") } } compileOptions { @@ -61,22 +67,3 @@ android { } } } - -//dependencies { -// -// implementation(libs.androidx.core.ktx) -// implementation(libs.androidx.lifecycle.runtime.ktx) -// implementation(libs.androidx.activity.compose) -// implementation(platform(libs.androidx.compose.bom)) -// implementation(libs.androidx.ui) -// implementation(libs.androidx.ui.graphics) -// implementation(libs.androidx.ui.tooling.preview) -// implementation(libs.androidx.material3) -// testImplementation(libs.junit) -// androidTestImplementation(libs.androidx.junit) -// androidTestImplementation(libs.androidx.espresso.core) -// androidTestImplementation(platform(libs.androidx.compose.bom)) -// androidTestImplementation(libs.androidx.ui.test.junit4) -// debugImplementation(libs.androidx.ui.tooling) -// debugImplementation(libs.androidx.ui.test.manifest) -//} \ No newline at end of file diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index ab73a6c..bb94c00 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -1 +1 @@ -Breakout 71 \ No newline at end of file +Breakout 71 \ No newline at end of file diff --git a/build.sh b/build.sh index c8c3142..8fe0665 100755 --- a/build.sh +++ b/build.sh @@ -46,3 +46,6 @@ rm -rf ./app/src/main/assets/* cp public/* build rm -rf ./app/src/main/assets/* cp build/index.html ./app/src/main/assets/ + +# generate signed apk +./gradlew assembleRelease \ No newline at end of file diff --git a/deploy.sh b/deploy.sh index 013b60f..d77abab 100755 --- a/deploy.sh +++ b/deploy.sh @@ -30,4 +30,5 @@ rsync -avz --delete --delete-excluded --exclude="*.sh" --exclude="node_modules" # upload to itch.io , upload the index file directly butler push "./build/index.html" renanlecaro/breakout71:latest --userversion $versionCode butler push "./build/index.html" renanlecaro/breakout71:offline --userversion $versionCode +butler push app/build/outputs/apk/release/app-release.apk renanlecaro/breakout71:apk --userversion $versionCode diff --git a/dist/index.html b/dist/index.html index b8d4beb..5872e84 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1475,7 +1475,7 @@ const upgrades = (0, _upgrades.rawUpgrades).map((u)=>({ })); },{"./data/palette.json":"ktRBU","./data/levels.json":"8JSUc","./data/version.json":"iyP6E","./upgrades":"1u3Dx","./getLevelBackground":"7OIPf","./levelIcon":"6rQoT","@parcel/transformer-js/src/esmodule-helpers.js":"gkKU3"}],"iyP6E":[function(require,module,exports,__globalThis) { -module.exports = JSON.parse("\"29060103\""); +module.exports = JSON.parse("\"29060146\""); },{}],"1u3Dx":[function(require,module,exports,__globalThis) { var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js"); diff --git a/src/PWA/sw-b71.js b/src/PWA/sw-b71.js index a3c57da..4a62c49 100644 --- a/src/PWA/sw-b71.js +++ b/src/PWA/sw-b71.js @@ -1,5 +1,5 @@ // The version of the cache. -const VERSION = "29060103"; +const VERSION = "29060146"; // The name of the cache const CACHE_NAME = `breakout-71-${VERSION}`; diff --git a/src/data/version.json b/src/data/version.json index ca47cdb..b010e6b 100644 --- a/src/data/version.json +++ b/src/data/version.json @@ -1 +1 @@ -"29060103" +"29060146"