From bd284ab56126f9ecc3408b09df11caacfd008b4d Mon Sep 17 00:00:00 2001 From: Muhammad Faisal Amir Date: Sat, 29 Apr 2023 07:11:55 +0700 Subject: [PATCH 1/2] update: gradle Co-authored-by: frogoboxbot --- .../android-ci-generate-apk-aab-download.yml | 2 +- .../android-ci-generate-apk-aab-upload.yml | 2 +- .github/workflows/android-ci.yml | 2 +- README.md | 2 +- SECURITY.md | 2 +- app/build.gradle.kts | 58 +++++++++---------- build.gradle.kts | 4 +- buildSrc/src/main/kotlin/ProjectSetting.kt | 7 ++- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 44 insertions(+), 41 deletions(-) diff --git a/.github/workflows/android-ci-generate-apk-aab-download.yml b/.github/workflows/android-ci-generate-apk-aab-download.yml index 771ad08..2e8fa46 100644 --- a/.github/workflows/android-ci-generate-apk-aab-download.yml +++ b/.github/workflows/android-ci-generate-apk-aab-download.yml @@ -30,7 +30,7 @@ jobs: - name: Set Up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Change wrapper permissions run: chmod +x ./gradlew diff --git a/.github/workflows/android-ci-generate-apk-aab-upload.yml b/.github/workflows/android-ci-generate-apk-aab-upload.yml index a0851e8..7a7d208 100644 --- a/.github/workflows/android-ci-generate-apk-aab-upload.yml +++ b/.github/workflows/android-ci-generate-apk-aab-upload.yml @@ -35,7 +35,7 @@ jobs: - name: Set Up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Change wrapper permissions run: chmod +x ./gradlew diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 3a01fde..2bfb37c 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -36,7 +36,7 @@ jobs: - name: Set Up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Change wrapper permissions run: chmod +x ./gradlew diff --git a/README.md b/README.md index 365d392..251786b 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ jobs: - name: Set Up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Change wrapper permissions run: chmod +x ./gradlew diff --git a/SECURITY.md b/SECURITY.md index 3530e7b..6c8dea8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,7 +6,7 @@ Use this section to tell people about which versions of your project are currently being supported with security updates. | Version | Supported | -| ------- | ------------------ | +|---------|--------------------| | 5.1.x | :white_check_mark: | | 5.0.x | :x: | | 4.0.x | :white_check_mark: | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 497b1e9..2d90bb1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { compileSdk = ProjectSetting.PROJECT_COMPILE_SDK - namespace = "com.frogobox.githubaction" + namespace = ProjectSetting.PROJECT_NAME_SPACE defaultConfig { @@ -25,51 +25,51 @@ android { } -signingConfigs { - create("release") { - // You need to specify either an absolute path or include the - // keystore file in the same directory as the build.gradle file. - // [PROJECT FOLDER NAME/app/[COPY YOUT KEY STORE] .jks in here - storeFile = file(ProjectSetting.KEY_PATH) - storePassword = ProjectSetting.KEY_STORE_PASSWORD - keyAlias = ProjectSetting.KEY_ALIAS - keyPassword = ProjectSetting.KEY_ALIAS_PASSWORD + signingConfigs { + create("release") { + // You need to specify either an absolute path or include the + // keystore file in the same directory as the build.gradle file. + // [PROJECT FOLDER NAME/app/[COPY YOUT KEY STORE] .jks in here + storeFile = file(ProjectSetting.KEY_PATH) + storePassword = ProjectSetting.KEY_STORE_PASSWORD + keyAlias = ProjectSetting.KEY_ALIAS + keyPassword = ProjectSetting.KEY_ALIAS_PASSWORD + } } -} -buildTypes { - getByName("release") { - isMinifyEnabled = false + buildTypes { + getByName("release") { + isMinifyEnabled = false - // Disable Debug Mode - isDebuggable = false - isJniDebuggable = false - isRenderscriptDebuggable = false - isPseudoLocalesEnabled = false + // Disable Debug Mode + isDebuggable = false + isJniDebuggable = false + isRenderscriptDebuggable = false + isPseudoLocalesEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) - // Generated Signed APK / AAB - signingConfig = signingConfigs.getByName("release") + // Generated Signed APK / AAB + signingConfig = signingConfigs.getByName("release") + } } -} buildFeatures { viewBinding = true } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } } diff --git a/build.gradle.kts b/build.gradle.kts index c6dd04b..8fb0dc3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "7.4.2" apply false - id("com.android.library") version "7.4.2" apply false + id("com.android.application") version "8.0.0" apply false + id("com.android.library") version "8.0.0" apply false id("org.jetbrains.kotlin.android") version Dependency.KOTLIN_VERSION apply false } diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt index 94f6a44..6009470 100644 --- a/buildSrc/src/main/kotlin/ProjectSetting.kt +++ b/buildSrc/src/main/kotlin/ProjectSetting.kt @@ -1,4 +1,4 @@ -/* +/** * Created by faisalamir on 19/09/21 * FrogoRecyclerView * ----------------------------------------- @@ -42,12 +42,13 @@ object ProjectSetting { const val PROJECT_TARGET_SDK = PROJECT_COMPILE_SDK const val PROJECT_APP_ID = "$APP_DOMAIN.$APP_PLAY_CONSOLE.$APP_NAME" + const val PROJECT_NAME_SPACE = "com.frogobox.githubaction" const val PROJECT_VERSION_CODE = (VERSION_MAJOR * 100) + (VERSION_MINOR * 10) + (VERSION_PATCH * 1) const val PROJECT_VERSION_NAME = "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH" // Declaration apk / aab name - val NAME_APK = NAME_APP.toLowerCase().replace(" ", "-") - val NAME_DB = NAME_APP.toLowerCase().replace(" ", "_") + val NAME_APK = NAME_APP.lowercase().replace(" ", "-") + val NAME_DB = NAME_APP.lowercase().replace(" ", "_") val DB = "\"$NAME_DB.db\"" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index cd0519b..022338b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # 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, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e8e8f6b..8890c5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Feb 11 12:32:43 WIB 2022 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 zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 7e170aab8f1657a7f0b3a0700220ba632b6044a5 Mon Sep 17 00:00:00 2001 From: Muhammad Faisal Amir Date: Sat, 29 Apr 2023 07:25:29 +0700 Subject: [PATCH 2/2] update: gradle Co-authored-by: frogoboxbot --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 251786b..1207c0f 100644 --- a/README.md +++ b/README.md @@ -26,12 +26,15 @@ ## Version Release This Is Latest Release - $version_release = 2.1.1 + $version_release = 2.2.0 What's New?? * Update Action Script * * Update Android Studio Latest Version * + * Update Gradle Latest Version * + * Update Kotlin Latest Version * + * Update Java Version From 11 to 17 * ## Article Sources - [How To Securely Build and Sign Your Android App With GitHub Actions](https://proandroiddev.com/how-to-securely-build-and-sign-your-android-app-with-github-actions-ad5323452ce)