Skip to content

Commit 3f71e71

Browse files
Merge pull request #11 from amirisback/develop/update-gradle
UPDATE :: Gradle Co-authored-by: frogoboxbot <[email protected]>
2 parents 9279b5a + 7e170aa commit 3f71e71

10 files changed

+48
-42
lines changed

.github/workflows/android-ci-generate-apk-aab-download.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set Up JDK
3131
uses: actions/setup-java@v1
3232
with:
33-
java-version: 11
33+
java-version: 17
3434

3535
- name: Change wrapper permissions
3636
run: chmod +x ./gradlew

.github/workflows/android-ci-generate-apk-aab-upload.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Set Up JDK
3636
uses: actions/setup-java@v1
3737
with:
38-
java-version: 11
38+
java-version: 17
3939

4040
- name: Change wrapper permissions
4141
run: chmod +x ./gradlew

.github/workflows/android-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set Up JDK
3737
uses: actions/setup-java@v1
3838
with:
39-
java-version: 11
39+
java-version: 17
4040

4141
- name: Change wrapper permissions
4242
run: chmod +x ./gradlew

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,15 @@
2626
## Version Release
2727
This Is Latest Release
2828

29-
$version_release = 2.1.1
29+
$version_release = 2.2.0
3030

3131
What's New??
3232

3333
* Update Action Script *
3434
* Update Android Studio Latest Version *
35+
* Update Gradle Latest Version *
36+
* Update Kotlin Latest Version *
37+
* Update Java Version From 11 to 17 *
3538

3639
## Article Sources
3740
- [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)
@@ -91,7 +94,7 @@ jobs:
9194
- name: Set Up JDK
9295
uses: actions/setup-java@v1
9396
with:
94-
java-version: 11
97+
java-version: 17
9598

9699
- name: Change wrapper permissions
97100
run: chmod +x ./gradlew

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Use this section to tell people about which versions of your project are
66
currently being supported with security updates.
77

88
| Version | Supported |
9-
| ------- | ------------------ |
9+
|---------|--------------------|
1010
| 5.1.x | :white_check_mark: |
1111
| 5.0.x | :x: |
1212
| 4.0.x | :white_check_mark: |

app/build.gradle.kts

+29-29
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
compileSdk = ProjectSetting.PROJECT_COMPILE_SDK
8-
namespace = "com.frogobox.githubaction"
8+
namespace = ProjectSetting.PROJECT_NAME_SPACE
99

1010
defaultConfig {
1111

@@ -25,51 +25,51 @@ android {
2525

2626
}
2727

28-
signingConfigs {
29-
create("release") {
30-
// You need to specify either an absolute path or include the
31-
// keystore file in the same directory as the build.gradle file.
32-
// [PROJECT FOLDER NAME/app/[COPY YOUT KEY STORE] .jks in here
33-
storeFile = file(ProjectSetting.KEY_PATH)
34-
storePassword = ProjectSetting.KEY_STORE_PASSWORD
35-
keyAlias = ProjectSetting.KEY_ALIAS
36-
keyPassword = ProjectSetting.KEY_ALIAS_PASSWORD
28+
signingConfigs {
29+
create("release") {
30+
// You need to specify either an absolute path or include the
31+
// keystore file in the same directory as the build.gradle file.
32+
// [PROJECT FOLDER NAME/app/[COPY YOUT KEY STORE] .jks in here
33+
storeFile = file(ProjectSetting.KEY_PATH)
34+
storePassword = ProjectSetting.KEY_STORE_PASSWORD
35+
keyAlias = ProjectSetting.KEY_ALIAS
36+
keyPassword = ProjectSetting.KEY_ALIAS_PASSWORD
37+
}
3738
}
38-
}
3939

40-
buildTypes {
41-
getByName("release") {
42-
isMinifyEnabled = false
40+
buildTypes {
41+
getByName("release") {
42+
isMinifyEnabled = false
4343

44-
// Disable Debug Mode
45-
isDebuggable = false
46-
isJniDebuggable = false
47-
isRenderscriptDebuggable = false
48-
isPseudoLocalesEnabled = false
44+
// Disable Debug Mode
45+
isDebuggable = false
46+
isJniDebuggable = false
47+
isRenderscriptDebuggable = false
48+
isPseudoLocalesEnabled = false
4949

50-
proguardFiles(
51-
getDefaultProguardFile("proguard-android-optimize.txt"),
52-
"proguard-rules.pro"
53-
)
50+
proguardFiles(
51+
getDefaultProguardFile("proguard-android-optimize.txt"),
52+
"proguard-rules.pro"
53+
)
5454

55-
// Generated Signed APK / AAB
56-
signingConfig = signingConfigs.getByName("release")
55+
// Generated Signed APK / AAB
56+
signingConfig = signingConfigs.getByName("release")
5757

58+
}
5859
}
59-
}
6060

6161
buildFeatures {
6262
viewBinding = true
6363
}
6464

6565
compileOptions {
66-
sourceCompatibility = JavaVersion.VERSION_11
67-
targetCompatibility = JavaVersion.VERSION_11
66+
sourceCompatibility = JavaVersion.VERSION_17
67+
targetCompatibility = JavaVersion.VERSION_17
6868
}
6969

7070
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
7171
kotlinOptions {
72-
jvmTarget = "11"
72+
jvmTarget = "17"
7373
}
7474
}
7575
}

build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "7.4.2" apply false
4-
id("com.android.library") version "7.4.2" apply false
3+
id("com.android.application") version "8.0.0" apply false
4+
id("com.android.library") version "8.0.0" apply false
55
id("org.jetbrains.kotlin.android") version Dependency.KOTLIN_VERSION apply false
66
}
77

buildSrc/src/main/kotlin/ProjectSetting.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/**
22
* Created by faisalamir on 19/09/21
33
* FrogoRecyclerView
44
* -----------------------------------------
@@ -42,12 +42,13 @@ object ProjectSetting {
4242
const val PROJECT_TARGET_SDK = PROJECT_COMPILE_SDK
4343

4444
const val PROJECT_APP_ID = "$APP_DOMAIN.$APP_PLAY_CONSOLE.$APP_NAME"
45+
const val PROJECT_NAME_SPACE = "com.frogobox.githubaction"
4546
const val PROJECT_VERSION_CODE = (VERSION_MAJOR * 100) + (VERSION_MINOR * 10) + (VERSION_PATCH * 1)
4647
const val PROJECT_VERSION_NAME = "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
4748

4849
// Declaration apk / aab name
49-
val NAME_APK = NAME_APP.toLowerCase().replace(" ", "-")
50-
val NAME_DB = NAME_APP.toLowerCase().replace(" ", "_")
50+
val NAME_APK = NAME_APP.lowercase().replace(" ", "-")
51+
val NAME_DB = NAME_APP.lowercase().replace(" ", "_")
5152
val DB = "\"$NAME_DB.db\""
5253

5354
}

gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ kotlin.code.style=official
2020
# Enables namespacing of each library's R class so that its R class includes only the
2121
# resources declared in the library itself and none from the library's dependencies,
2222
# thereby reducing the size of the R class for that library
23-
android.nonTransitiveRClass=true
23+
android.nonTransitiveRClass=true
24+
android.defaults.buildfeatures.buildconfig=true
25+
android.nonFinalResIds=false
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Feb 11 12:32:43 WIB 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)