Merge pull request #47 from amirisback/develop/update-new-buildsrc

DEVELOP :: Update Build Src
amirisback · Jun 18, 2023 · 2017102 · 2017102
2 parents 5043263 + 4b24a6a
commit 2017102
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
 ## Version Release
 This Is Latest Release
 
-    $version_release = 1.1.3
+    $version_release = 1.1.4
 
 What's New??
 
@@ -64,14 +64,14 @@ allprojects {
 
     dependencies {
         // library frogo-keyboard
-        implementation 'com.github.amirisback:keyboard:1.1.3'
+        implementation 'com.github.amirisback:keyboard:1.1.4'
     }
 
 #### <Option 2> Kotlin DSL Gradle
 
     dependencies {
         // library frogo-keyboard
-        implementation("com.github.amirisback:keyboard:1.1.3")
+        implementation("com.github.amirisback:keyboard:1.1.4")
     }
 
 ### Step 3. Create Service Keyboard IME

diff --git a/app/src/main/java/com/frogobox/appkeyboard/ui/keyboard/movie/MovieKeyboard.kt b/app/src/main/java/com/frogobox/appkeyboard/ui/keyboard/movie/MovieKeyboard.kt
@@ -9,10 +9,10 @@ import com.bumptech.glide.Glide
 import com.frogobox.api.movie.ConsumeMovieApi
 import com.frogobox.appkeyboard.databinding.ItemKeyboardMovieBinding
 import com.frogobox.appkeyboard.databinding.KeyboardGridBinding
-import com.frogobox.coreapi.movie.MovieUrl
-import com.frogobox.coreapi.movie.model.TrendingMovie
-import com.frogobox.coreapi.movie.response.Trending
 import com.frogobox.coresdk.response.FrogoDataResponse
+import com.frogobox.coreutil.movie.MovieUrl
+import com.frogobox.coreutil.movie.model.TrendingMovie
+import com.frogobox.coreutil.movie.response.Trending
 import com.frogobox.libkeyboard.common.core.BaseKeyboard
 import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
 import com.frogobox.recycler.core.IFrogoBindingAdapter

diff --git a/app/src/main/java/com/frogobox/appkeyboard/ui/keyboard/news/NewsKeyboard.kt b/app/src/main/java/com/frogobox/appkeyboard/ui/keyboard/news/NewsKeyboard.kt
@@ -9,11 +9,12 @@ import com.frogobox.api.news.ConsumeNewsApi
 import com.frogobox.appkeyboard.databinding.ItemKeyboardNewsBinding
 import com.frogobox.appkeyboard.databinding.KeyboardListBinding
 import com.frogobox.coreapi.ConsumeApiResponse
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_HEALTH
-import com.frogobox.coreapi.news.NewsConstant.COUNTRY_ID
-import com.frogobox.coreapi.news.NewsUrl
-import com.frogobox.coreapi.news.model.Article
-import com.frogobox.coreapi.news.response.ArticleResponse
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_HEALTH
+import com.frogobox.coreutil.news.NewsConstant.COUNTRY_ID
+import com.frogobox.coreutil.news.NewsUrl
+import com.frogobox.coreutil.news.model.Article
+import com.frogobox.coreutil.news.response.ArticleResponse
+
 import com.frogobox.libkeyboard.common.core.BaseKeyboard
 import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
 import com.frogobox.recycler.core.IFrogoBindingAdapter

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,5 +10,5 @@ repositories {
 }
 
 dependencies{
-    implementation("com.github.frogobox:open-build-src:2.1.8")
+    implementation("com.github.frogobox:open-build-src:2.1.9")
 }
diff --git a/buildSrc/src/main/kotlin/DependencyGradle.kt b/buildSrc/src/main/kotlin/DependencyGradle.kt
@@ -5,10 +5,10 @@ object DependencyGradle {
 
     const val MODULE_LIB_FROGO_KEYBOARD = ":frogo-keyboard"
 
-    private const val FROGO_SDK_VERSION = "2.1.8"
-    private const val FROGO_UI_VERSION = "1.1.6"
-    private const val FROGO_CONSUME_API_VERSION = "2.4.7"
-    private const val FROGO_ADMOB_VERSION = "5.2.2"
+    private const val FROGO_SDK_VERSION = "2.2.1"
+    private const val FROGO_UI_VERSION = "1.1.8"
+    private const val FROGO_CONSUME_API_VERSION = "2.4.9"
+    private const val FROGO_ADMOB_VERSION = "5.3.0"
     private const val FROGO_RECYCLER_VIEW_VERSION = "4.3.5"
 
     const val FROGO_SDK = "com.github.frogobox:frogo-sdk:$FROGO_SDK_VERSION"

diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt
@@ -18,13 +18,12 @@ object ProjectSetting {
 
     const val APP_DOMAIN = "com"
     const val APP_PLAY_CONSOLE = "frogobox"
-    val APP_NAME = NAME_APP.lowercase().replace(" ", "").replace(" ", "-")
 
     // ---------------------------------------------------------------------------------------------
 
     const val VERSION_MAJOR = 1
     const val VERSION_MINOR = 1
-    const val VERSION_PATCH = 3
+    const val VERSION_PATCH = 4
 
     // ---------------------------------------------------------------------------------------------
 
@@ -34,12 +33,14 @@ object ProjectSetting {
 
     // ---------------------------------------------------------------------------------------------
 
-    const val BASE_PACAKGE_NAME = "$APP_DOMAIN.$APP_PLAY_CONSOLE"
+    const val BASE_PACAKGE_NAME = "com.frogobox"
 
     const val MODULE_APP = "appkeyboard"
     const val MODULE_LIB_FROGO_KEYBOARD = "libkeyboard"
 
-    val PROJECT_APP_ID = "$BASE_PACAKGE_NAME.$APP_NAME"
+    val APP_NAME = NAME_APP.lowercase().replace(" ", "")
+
+    val PROJECT_APP_ID = "$APP_DOMAIN.$APP_PLAY_CONSOLE.$APP_NAME"
 
     const val PROJECT_NAME_SPACE_APP = "$BASE_PACAKGE_NAME.$MODULE_APP"
     const val PROJECT_NAME_SPACE_LIB_FROGO_KEYBOARD = "$BASE_PACAKGE_NAME.$MODULE_LIB_FROGO_KEYBOARD"