Release v2.0.0

amirisback · Apr 15, 2022 · 0194486 · 0194486
1 parent b92becf
commit 0194486
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 117 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 This Is Latest Release
 
     ~ Beta Release
-    $version_release = 1.0.0
+    $version_release = 2.0.0
 
 What's New??
 
@@ -55,7 +55,7 @@ What's New??
 allprojects {
     repositories {
         ...
-        maven { url = uri("https://jitpack.io") }
+        maven("https://jitpack.io")
     }
 }
 ```
@@ -66,14 +66,14 @@ allprojects {
 
     dependencies {
         // library nutrition-framework
-        implementation 'com.github.amirisback:nutrition-framework:1.0.0'
+        implementation 'com.github.amirisback:nutrition-framework:2.0.0'
     }
 
 #### <Option 2> Kotlin DSL Gradle (build.gradle.kts)
 
     dependencies {
         // library nutrition-framework
-        implementation("com.github.amirisback:nutrition-framework:1.0.0")
+        implementation("com.github.amirisback:nutrition-framework:2.0.0")
     }
 
 ## Application Framework

diff --git 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.1.2" apply false
-    id("com.android.library") version "7.1.2" apply false
+    id("com.android.application") version "7.1.3" apply false
+    id("com.android.library") version "7.1.3" apply false
     id("org.jetbrains.kotlin.android") version DependencyGradle.KOTLIN_VERSION apply false
     id("org.jetbrains.kotlin.jvm") version DependencyGradle.KOTLIN_VERSION apply false
 }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 
 repositories {
     mavenCentral()
-    maven { url = uri("https://jitpack.io") }
+    maven("https://jitpack.io")
 }
 
 dependencies {
     // library open-build-src
-    implementation("com.github.frogobox:open-build-src:1.0.6")
+    implementation("com.github.frogobox:open-build-src:1.1.1")
 }
diff --git a/buildSrc/src/main/kotlin/DependencyGradle.kt b/buildSrc/src/main/kotlin/DependencyGradle.kt
@@ -14,6 +14,6 @@
 object DependencyGradle {
 
     const val KOTLIN_VERSION = Version.JetBrains.kotlin
-    const val COMPOSE_MULTIPLATFORM_VERSION = Version.AndroidX.composeMultiPlatform
+    const val COMPOSE_MULTIPLATFORM_VERSION = Version.Androidx.composeMultiPlatform
 
 }
diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt
@@ -20,7 +20,7 @@ object ProjectSetting {
     private const val APP_PLAY_CONSOLE = "frogobox"
     private const val BASE_PACKAGE = "nutrition"
 
-    private const val VERSION_MAJOR = 1
+    private const val VERSION_MAJOR = 2
     private const val VERSION_MINOR = 0
     private const val VERSION_PATCH = 0
 

diff --git a/nutritionapp/build.gradle.kts b/nutritionapp/build.gradle.kts
@@ -99,72 +99,72 @@ android {
 
 dependencies {
 
-    implementation(project(":nutritioncore"))
-    implementation(project(":nutritionframework"))
-
-    implementation(compose.ui)
-    implementation(compose.runtime)
-    implementation(compose.preview)
-    implementation(compose.uiTooling)
-    implementation(compose.material)
-    implementation(compose.materialIconsExtended)
-
-    implementation(Androidx.appCompat)
-    implementation(Androidx.constraintLayout)
-    implementation(Androidx.Compose.activity)
-
-    implementation(Androidx.activityKtx)
-    implementation(Androidx.fragmentKtx)
-    implementation(Androidx.Core.ktx)
-    implementation(Androidx.preferenceKtx)
-    implementation(Androidx.Lifecycle.livedataKtx)
-    implementation(Androidx.Lifecycle.viewmodelKtx)
-    implementation(Androidx.Lifecycle.runtimeKtx)
-    implementation(Androidx.Lifecycle.reactivestreamsKtx)
-
-    implementation(Androidx.navigationFragmentKtx)
-    implementation(Androidx.navigationRuntimeKtx)
-    implementation(Androidx.navigationUiKtx)
-
-    implementation(Androidx.collection)
-
-    implementation(Androidx.Room.runtime)
-    implementation(Androidx.Room.ktx)
-    implementation(Androidx.Room.rxJava3)
-
-    implementation(Google.admob)
-    implementation(Google.gson)
-    implementation(Google.material)
-
-    implementation(Square.okhttp)
-    implementation(Square.okhttpLogging)
-
-    implementation(Square.Retrofit2.retrofit)
-    implementation(Square.Retrofit2.converterGson)
-    implementation(Square.Retrofit2.adapterRxJava3)
-
-    implementation(Reactivex.rxAndroid3)
-    implementation(Reactivex.rxJava3)
-
-    implementation(Koin.core)
-    implementation(Koin.android)
-    implementation(Koin.androidCompat)
-    implementation(Koin.androidxWorkManager)
-    implementation(Koin.androidxCompose)
-
-    implementation(Util.glide)
-
-    implementation(Util.hdodenhofCircleImageView)
-    implementation(Util.chucker)
-
-    implementation("io.coil-kt:coil-compose:1.4.0")
+    api(project(":nutritioncore"))
+    api(project(":nutritionframework"))
+
+    api(compose.ui)
+    api(compose.runtime)
+    api(compose.preview)
+    api(compose.uiTooling)
+    api(compose.material)
+    api(compose.materialIconsExtended)
+
+    api(Androidx.appCompat)
+    api(Androidx.constraintLayout)
+    api(Androidx.Compose.activity)
+
+    api(Androidx.activityKtx)
+    api(Androidx.fragmentKtx)
+    api(Androidx.Core.ktx)
+    api(Androidx.preferenceKtx)
+    api(Androidx.Lifecycle.livedataKtx)
+    api(Androidx.Lifecycle.viewmodelKtx)
+    api(Androidx.Lifecycle.runtimeKtx)
+    api(Androidx.Lifecycle.reactivestreamsKtx)
+
+    api(Androidx.navigationFragmentKtx)
+    api(Androidx.navigationRuntimeKtx)
+    api(Androidx.navigationUiKtx)
+
+    api(Androidx.collection)
+
+    api(Androidx.Room.runtime)
+    api(Androidx.Room.ktx)
+    api(Androidx.Room.rxJava3)
+
+    api(Google.admob)
+    api(Google.gson)
+    api(Google.material)
+
+    api(Square.OkHttp.okhttp)
+    api(Square.OkHttp.loggingInterceptor)
+
+    api(Square.Retrofit2.retrofit)
+    api(Square.Retrofit2.converterGson)
+    api(Square.Retrofit2.adapterRxJava3)
+
+    api(Reactivex.rxAndroid3)
+    api(Reactivex.rxJava3)
+
+    api(Koin.core)
+    api(Koin.android)
+    api(Koin.androidCompat)
+    api(Koin.androidxWorkManager)
+    api(Koin.androidxCompose)
+
+    api(GitHub.glide)
+    api(GitHub.chucker)
+
+    api(Util.hdodenhofCircleImageView)
+    
+    api("io.coil-kt:coil-compose:1.4.0")
 
     api(JetBrains.coroutinesCore)
     api(JetBrains.coroutinesAndroid)
 
     kapt(Androidx.Lifecycle.compiler)
     kapt(Androidx.Room.compiler)
-    kapt(Util.glideCompiler)
+    kapt(GitHub.glideCompiler)
 
     debugImplementation(compose.ui)
     debugImplementation(compose.uiTooling)

diff --git a/nutritioncore/build.gradle.kts b/nutritioncore/build.gradle.kts
@@ -21,24 +21,24 @@ tasks.withType<KotlinCompile>() {
 
 dependencies {
 
-    implementation(compose.ui)
-    implementation(compose.runtime)
-    implementation(compose.preview)
-    implementation(compose.uiTooling)
-    implementation(compose.material)
-    implementation(compose.materialIconsExtended)
+    api(compose.ui)
+    api(compose.runtime)
+    api(compose.preview)
+    api(compose.uiTooling)
+    api(compose.material)
+    api(compose.materialIconsExtended)
 
-    implementation(Square.okhttp)
-    implementation(Square.okhttpLogging)
+    api(Square.OkHttp.okhttp)
+    api(Square.OkHttp.loggingInterceptor)
 
-    implementation(Square.Retrofit2.retrofit)
-    implementation(Square.Retrofit2.converterGson)
-    implementation(Square.Retrofit2.adapterRxJava3)
+    api(Square.Retrofit2.retrofit)
+    api(Square.Retrofit2.converterGson)
+    api(Square.Retrofit2.adapterRxJava3)
 
-    implementation(Google.gson)
-    implementation(Koin.core)
+    api(Google.gson)
+    api(Koin.core)
 
-    implementation(Reactivex.rxJava3)
+    api(Reactivex.rxJava3)
 
 }
 
@@ -67,7 +67,7 @@ publishing {
     }
 
     repositories {
-        maven { url = uri("https://jitpack.io") }
+        maven("https://jitpack.io")
     }
 
 }
diff --git a/nutritionframework/build.gradle.kts b/nutritionframework/build.gradle.kts
@@ -40,50 +40,50 @@ android {
 
 dependencies {
 
-    implementation(project(":nutritioncore"))
+    api(project(":nutritioncore"))
 
-    implementation(compose.ui)
-    implementation(compose.runtime)
-    implementation(compose.preview)
-    implementation(compose.uiTooling)
-    implementation(compose.material)
-    implementation(compose.materialIconsExtended)
+    api(compose.ui)
+    api(compose.runtime)
+    api(compose.preview)
+    api(compose.uiTooling)
+    api(compose.material)
+    api(compose.materialIconsExtended)
 
-    implementation(Androidx.appCompat)
-    implementation(Androidx.constraintLayout)
-    implementation(Androidx.Core.ktx)
-    implementation(Androidx.Lifecycle.livedataKtx)
-    implementation(Androidx.Lifecycle.viewmodelKtx)
-    implementation(Androidx.Lifecycle.runtimeKtx)
+    api(Androidx.appCompat)
+    api(Androidx.constraintLayout)
+    api(Androidx.Core.ktx)
+    api(Androidx.Lifecycle.livedataKtx)
+    api(Androidx.Lifecycle.viewmodelKtx)
+    api(Androidx.Lifecycle.runtimeKtx)
 
-    implementation(Google.admob)
-    implementation(Google.gson)
-    implementation(Google.material)
+    api(Google.admob)
+    api(Google.gson)
+    api(Google.material)
 
-    implementation(Square.okhttp)
-    implementation(Square.okhttpLogging)
+    api(Square.OkHttp.okhttp)
+    api(Square.OkHttp.loggingInterceptor)
 
-    implementation(Square.Retrofit2.retrofit)
-    implementation(Square.Retrofit2.converterGson)
-    implementation(Square.Retrofit2.adapterRxJava3)
+    api(Square.Retrofit2.retrofit)
+    api(Square.Retrofit2.converterGson)
+    api(Square.Retrofit2.adapterRxJava3)
 
-    implementation(Reactivex.rxAndroid3)
-    implementation(Reactivex.rxJava3)
+    api(Reactivex.rxAndroid3)
+    api(Reactivex.rxJava3)
 
-    implementation(Util.glide)
-    implementation(Util.hdodenhofCircleImageView)
+    api(GitHub.glide)
+    api(GitHub.chucker)
 
-    implementation(Util.chucker)
+    api(Util.hdodenhofCircleImageView)
 
-    implementation("io.coil-kt:coil-compose:1.4.0")
-    implementation("com.github.javiersantos:PiracyChecker:1.2.8")
-    implementation("com.facebook.shimmer:shimmer:0.5.0")
+    api("io.coil-kt:coil-compose:1.4.0")
+    api("com.github.javiersantos:PiracyChecker:1.2.8")
+    api("com.facebook.shimmer:shimmer:0.5.0")
 
     api(JetBrains.coroutinesCore)
     api(JetBrains.coroutinesAndroid)
 
     kapt(Androidx.Lifecycle.compiler)
-    kapt(Util.glideCompiler)
+    kapt(GitHub.glideCompiler)
 
     debugImplementation(compose.ui)
     debugImplementation(compose.uiTooling)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,7 +4,7 @@ pluginManagement {
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        maven { url = uri("https://jitpack.io") }
+        maven("https://jitpack.io")
     }
 }
 
@@ -14,7 +14,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        maven { url = uri("https://jitpack.io") }
+        maven("https://jitpack.io")
     }
 }