Skip to content
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.

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

DEVELOP :: Renaming module name, tidy up code #37

Merged
merged 2 commits into from
Jun 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 22 additions & 7 deletions .github/workflows/android-ci-generated-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ env:
on:
# Triggers the workflow on push or pull request events but only for default and protected branches
workflow_dispatch:
# The workflow will be dispatched to the default queue
branches: [ master ]
# The workflow will be dispatched to the default queue

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

# Set Current Date As Env Variable
- name: Set current date as env variable
Expand All @@ -28,11 +27,13 @@ jobs:
# Set Repository Name As Env Variable
- name: Set repository name as env variable
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV

- name: Set Up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17'
cache: 'gradle'

- name: Change wrapper permissions
run: chmod +x ./gradlew
Expand All @@ -59,9 +60,23 @@ jobs:
run: ./gradlew ${{ env.main_project_module }}:bundleRelease

# Upload Artifact Build
# Noted For Output [main_project_module]/build/outputs/apk/debug/
- name: Upload APK Debug - ${{ env.repository_name }}
uses: actions/upload-artifact@v2
with:
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
path: ${{ env.main_project_module }}/build/outputs/apk/debug/

# Noted For Output [main_project_module]/build/outputs/apk/release/
- name: Upload APK Release - ${{ env.repository_name }}
uses: actions/upload-artifact@v2
with:
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated
path: ${{ env.main_project_module }}/build/outputs/apk/release/

# Noted For Output [main_project_module]/build/outputs/bundle/release/
- name: Upload AAB (App Bundle) Release - ${{ env.repository_name }}
uses: actions/upload-artifact@v2
with:
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
path: ${{ env.main_project_module }}/build/outputs/bundle/release/
path: ${{ env.main_project_module }}/build/outputs/bundle/release/
13 changes: 7 additions & 6 deletions .github/workflows/android-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,15 @@ on:
branches: [ master ]

workflow_dispatch:
# The workflow will be dispatched to the default queue
branches: [ master ]
# The workflow will be dispatched to the default queue

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

# Set Current Date As Env Variable
- name: Set current date as env variable
Expand All @@ -33,11 +32,13 @@ jobs:
# Set Repository Name As Env Variable
- name: Set repository name as env variable
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV

- name: Set Up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17'
cache: 'gradle'

- name: Change wrapper permissions
run: chmod +x ./gradlew
Expand Down
108 changes: 57 additions & 51 deletions README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 "8.0.1" apply false
id("com.android.library") version "8.0.1" apply false
id("com.android.application") version "8.0.2" apply false
id("com.android.library") version "8.0.2" apply false
id("org.jetbrains.kotlin.android") version DependencyGradle.KOTLIN_VERSION apply false
id("org.jetbrains.kotlin.jvm") version DependencyGradle.KOTLIN_VERSION apply false
}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ repositories {

dependencies{
// library frogo-build-src
implementation("com.github.frogobox:open-build-src:2.1.8")
implementation("com.github.frogobox:open-build-src:2.1.9")
}
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/DependencyGradle.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
object DependencyGradle {

// dependencies version
const val KOTLIN_VERSION = "1.8.20"
const val KOTLIN_VERSION = Version.JetBrains.kotlin
const val COMPOSE_MULTIPLATFORM_VERSION = Version.Androidx.composeMultiPlatform
const val COMPOSE_VERSION = "1.4.6"
const val COMPOSE_VERSION = Version.Androidx.composeCompiler

const val FROGO_PATH_CORE_UI = ":frogocoreui"
const val FROGO_PATH_UI = ":frogoui"
const val FROGO_PATH_CORE_UI = ":core-ui"
const val FROGO_PATH_UI = ":core-ui-android"

const val FrogoRecyclerView = "com.github.amirisback:frogo-recycler-view:4.3.5"

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/ProjectSetting.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object ProjectSetting {

const val VERSION_MAJOR = 1
const val VERSION_MINOR = 1
const val VERSION_PATCH = 6
const val VERSION_PATCH = 7

// ---------------------------------------------------------------------------------------------

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 5 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ dependencyResolutionManagement {
}

rootProject.name = "FrogoUI"
include(":app", ":frogoui", ":frogocoreui")
include(
":app",
":core-ui",
":core-ui-android"
)