diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3a01354..efe363c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.compose") version Dependency.COMPOSE_MULTIPLATFORM_VERSION id("kotlin-kapt") } @@ -103,9 +104,12 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1") implementation("androidx.activity:activity-compose:1.4.0") - implementation("androidx.compose.ui:ui:${Dependency.COMPOSE_VERSION}") - implementation("androidx.compose.material:material:${Dependency.COMPOSE_VERSION}") - implementation("androidx.compose.ui:ui-tooling-preview:${Dependency.COMPOSE_VERSION}") + implementation(compose.ui) + implementation(compose.runtime) + implementation(compose.preview) + implementation(compose.uiTooling) + implementation(compose.material) + implementation(compose.materialIconsExtended) implementation("com.google.code.gson:gson:2.8.9") implementation("com.google.android.material:material:1.5.0") diff --git a/app/src/main/java/com/frogobox/appsdk/BaseActivity.kt b/app/src/main/java/com/frogobox/appsdk/BaseActivity.kt index 3cc293d..8e91c59 100644 --- a/app/src/main/java/com/frogobox/appsdk/BaseActivity.kt +++ b/app/src/main/java/com/frogobox/appsdk/BaseActivity.kt @@ -2,7 +2,7 @@ package com.frogobox.appsdk import android.os.Bundle import androidx.viewbinding.ViewBinding -import com.frogobox.sdk.core.FrogoActivity +import com.frogobox.sdk.FrogoActivity /* * Created by faisalamir on 02/08/21 diff --git a/build.gradle.kts b/build.gradle.kts index 72958eb..b3479c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,13 @@ plugins { id("com.android.application") version "7.1.2" apply false id("com.android.library") version "7.1.2" apply false id("org.jetbrains.kotlin.android") version Dependency.KOTLIN_VERSION apply false + id("org.jetbrains.kotlin.jvm") version "1.6.10" apply false +} + +buildscript { + dependencies { + classpath("com.github.dcendents:android-maven-gradle-plugin:2.1") + } } tasks.register("clean", Delete::class) { diff --git a/buildSrc/src/main/kotlin/Dependency.kt b/buildSrc/src/main/kotlin/Dependency.kt index 083071e..2022d41 100644 --- a/buildSrc/src/main/kotlin/Dependency.kt +++ b/buildSrc/src/main/kotlin/Dependency.kt @@ -14,14 +14,20 @@ object Dependency { // dependencies version - - const val KOTLIN_VERSION = "1.5.31" const val COMPOSE_VERSION = "1.0.5" const val KOIN_VERSION = "3.1.4" const val ROOM_VERSION = "2.4.1" - const val ACTIVITY_KTX_VERSION = "1.2.3" - const val FRAGMENT_KTX_VERSION = "1.3.5" - + const val KOTLIN_VERSION = "1.6.10" + const val COMPOSE_MULTIPLATFORM_VERSION = "1.0.1" + + const val ACTIVITY_KTX_VERSION = "1.4.0" + const val FRAGMENT_KTX_VERSION = "1.4.0" + + const val RETROFIT_VERSION = "2.9.0" + const val GSON_VERSION = "2.8.9" + + const val COROUTINES_VERSION = "1.5.2" + } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt index e075168..a8dfdd6 100644 --- a/buildSrc/src/main/kotlin/ProjectSetting.kt +++ b/buildSrc/src/main/kotlin/ProjectSetting.kt @@ -14,30 +14,39 @@ object ProjectSetting { // project settings const val NAME_APP = "Frogo SDK" - val NAME_APK = NAME_APP.toLowerCase().replace(" ", "-") - - val NAME_DB = NAME_APP.toLowerCase().replace(" ", "_") - val DB = "\"$NAME_DB.db\"" const val APP_DOMAIN = "com" const val APP_PLAY_CONSOLE = "frogobox" const val APP_NAME = "appsdk" - const val LIBRARY_NAME = "sdk" - - const val VERSION_MAJOR = 2 + const val VERSION_MAJOR = 1 const val VERSION_MINOR = 0 - const val VERSION_PATCH = 8 + const val VERSION_PATCH = 0 const val PROJECT_COMPILE_SDK = 31 const val PROJECT_MIN_SDK = 21 const val PROJECT_TARGET_SDK = PROJECT_COMPILE_SDK - const val PROJECT_APP_ID = "$APP_DOMAIN.$APP_PLAY_CONSOLE.$APP_NAME" - const val PROJECT_LIB_ID = "$APP_DOMAIN.$APP_PLAY_CONSOLE.$LIBRARY_NAME" + const val BASE_PACAKGE_NAME = "$APP_DOMAIN.$APP_PLAY_CONSOLE" + + const val LIBRARY_NAME_SDK = "sdk" + const val LIBRARY_NAME_CORE_SDK = "coresdk" + + const val MODULE_NAME_SDK = "frogosdk" + const val MODULE_NAME_CORE_SDK = "frogocoresdk" + + const val PROJECT_APP_ID = "$BASE_PACAKGE_NAME.$APP_NAME" + const val PROJECT_LIB_ID_SDK = "$BASE_PACAKGE_NAME.$LIBRARY_NAME_SDK" + const val PROJECT_LIB_ID_CORE_SDK = "$BASE_PACAKGE_NAME.$LIBRARY_NAME_CORE_SDK" + 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" + val NAME_APK = NAME_APP.toLowerCase().replace(" ", "-") + + val NAME_DB = NAME_APP.toLowerCase().replace(" ", "_") + val DB = "\"$NAME_DB.db\"" + // Key Store const val PLAYSTORE_STORE_FILE = "frogoboxmedia.jks" const val PLAYSTORE_STORE_PASSWORD = "amirisback" diff --git a/frogocoresdk/.gitignore b/frogocoresdk/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/frogocoresdk/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/frogocoresdk/build.gradle.kts b/frogocoresdk/build.gradle.kts new file mode 100644 index 0000000..b6df456 --- /dev/null +++ b/frogocoresdk/build.gradle.kts @@ -0,0 +1,74 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + id("java-library") + id("org.jetbrains.kotlin.jvm") + id("org.jetbrains.compose") version Dependency.COMPOSE_MULTIPLATFORM_VERSION + `maven-publish` +} + +group = ProjectSetting.PROJECT_LIB_ID_CORE_SDK +version = ProjectSetting.PROJECT_VERSION_NAME + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +tasks.withType() { + kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString() +} + +dependencies { + + implementation(compose.ui) + implementation(compose.runtime) + implementation(compose.preview) + implementation(compose.uiTooling) + implementation(compose.material) + implementation(compose.materialIconsExtended) + + implementation("com.google.code.gson:gson:${Dependency.GSON_VERSION}") + + implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2") + implementation("com.squareup.okhttp3:logging-interceptor:4.9.3") + + implementation("com.squareup.retrofit2:retrofit:${Dependency.RETROFIT_VERSION}") + implementation("com.squareup.retrofit2:converter-gson:${Dependency.RETROFIT_VERSION}") + implementation("com.squareup.retrofit2:adapter-rxjava:${Dependency.RETROFIT_VERSION}") + implementation("com.squareup.retrofit2:adapter-rxjava2:${Dependency.RETROFIT_VERSION}") + + implementation("io.insert-koin:koin-core:${Dependency.KOIN_VERSION}") // Koin core features + + implementation("io.reactivex.rxjava2:rxjava:2.2.21") +} + +publishing { + + publications { + + // Creates a Maven publication called "release". + register("release", MavenPublication::class) { + + from(components["java"]) + + // Library Package Name (Example : "com.frogobox.androidfirstlib") + // NOTE : Different GroupId For Each Library / Module, So That Each Library Is Not Overwritten + groupId = ProjectSetting.PROJECT_LIB_ID_CORE_SDK + + // Library Name / Module Name (Example : "androidfirstlib") + // NOTE : Different ArtifactId For Each Library / Module, So That Each Library Is Not Overwritten + artifactId = ProjectSetting.MODULE_NAME_CORE_SDK + + // Version Library Name (Example : "1.0.0") + version = ProjectSetting.PROJECT_VERSION_NAME + + } + + } + + repositories { + maven { url = uri("https://jitpack.io") } + } + +} \ No newline at end of file diff --git a/frogocoresdk/src/main/java/com/frogobox/coresdk/MyClass.kt b/frogocoresdk/src/main/java/com/frogobox/coresdk/MyClass.kt new file mode 100644 index 0000000..d1f41a5 --- /dev/null +++ b/frogocoresdk/src/main/java/com/frogobox/coresdk/MyClass.kt @@ -0,0 +1,4 @@ +package com.frogobox.coresdk + +class MyClass { +} \ No newline at end of file diff --git a/frogosdk/build.gradle.kts b/frogosdk/build.gradle.kts index b9d456b..a5a538d 100644 --- a/frogosdk/build.gradle.kts +++ b/frogosdk/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("com.android.library") id("org.jetbrains.kotlin.android") + id("org.jetbrains.compose") version Dependency.COMPOSE_MULTIPLATFORM_VERSION id("kotlin-kapt") `maven-publish` } @@ -64,9 +65,12 @@ dependencies { implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("androidx.legacy:legacy-support-v4:1.0.0") - implementation("androidx.compose.ui:ui:${Dependency.COMPOSE_VERSION}") - implementation("androidx.compose.material:material:${Dependency.COMPOSE_VERSION}") - implementation("androidx.compose.ui:ui-tooling-preview:${Dependency.COMPOSE_VERSION}") + implementation(compose.ui) + implementation(compose.runtime) + implementation(compose.preview) + implementation(compose.uiTooling) + implementation(compose.material) + implementation(compose.materialIconsExtended) implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1") implementation("androidx.activity:activity-compose:1.4.0") @@ -133,11 +137,11 @@ afterEvaluate { // Library Package Name (Example : "com.frogobox.androidfirstlib") // NOTE : Different GroupId For Each Library / Module, So That Each Library Is Not Overwritten - groupId = ProjectSetting.PROJECT_LIB_ID + groupId = ProjectSetting.PROJECT_LIB_ID_SDK // Library Name / Module Name (Example : "androidfirstlib") // NOTE : Different ArtifactId For Each Library / Module, So That Each Library Is Not Overwritten - artifactId = ProjectSetting.NAME_APK + artifactId = ProjectSetting.MODULE_NAME_SDK // Version Library Name (Example : "1.0.0") version = ProjectSetting.PROJECT_VERSION_NAME diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoActivity.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoActivity.kt similarity index 99% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoActivity.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoActivity.kt index 46b5748..d35daa5 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoActivity.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoActivity.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.content.Intent import android.os.Bundle diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiCallback.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoApiCallback.kt similarity index 98% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiCallback.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoApiCallback.kt index 7b14667..6b6d2b9 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiCallback.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoApiCallback.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import io.reactivex.Observer import io.reactivex.disposables.Disposable diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiClient.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoApiClient.kt similarity index 98% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiClient.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoApiClient.kt index ed3e1dc..0fe1e0e 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiClient.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoApiClient.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.content.Context import android.util.Log diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiModel.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoApiModel.kt similarity index 95% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiModel.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoApiModel.kt index c11daa2..871230d 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoApiModel.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoApiModel.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import com.google.gson.annotations.SerializedName diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoComposeActivity.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoComposeActivity.kt similarity index 93% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoComposeActivity.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoComposeActivity.kt index f743093..caaa47f 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoComposeActivity.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoComposeActivity.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import androidx.activity.ComponentActivity diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoConstant.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoConstant.kt similarity index 98% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoConstant.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoConstant.kt index c67f762..2f8c98f 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoConstant.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoConstant.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.os.Environment diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoDate.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoDate.kt similarity index 99% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoDate.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoDate.kt index 3d22313..691fded 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoDate.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoDate.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.os.Build import android.text.format.DateFormat diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoFragment.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoFragment.kt similarity index 99% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoFragment.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoFragment.kt index 8d20ce9..c31f552 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoFragment.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoFragment.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.content.Intent import android.os.Bundle diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoFunc.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoFunc.kt similarity index 96% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoFunc.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoFunc.kt index 35be8bd..6247653 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoFunc.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoFunc.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.app.AlertDialog import android.content.Context @@ -6,9 +6,8 @@ import android.net.ConnectivityManager import android.net.NetworkInfo import android.os.Environment import android.os.Handler -import com.frogobox.sdk.R -import com.frogobox.sdk.core.FrogoConstant.Dir.DIR_NAME -import com.frogobox.sdk.core.FrogoConstant.Dir.VIDEO_FILE_NAME +import com.frogobox.sdk.FrogoConstant.Dir.DIR_NAME +import com.frogobox.sdk.FrogoConstant.Dir.VIDEO_FILE_NAME import com.google.gson.GsonBuilder import com.google.gson.reflect.TypeToken import java.io.BufferedReader diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoLiveEvent.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoLiveEvent.kt similarity index 97% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoLiveEvent.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoLiveEvent.kt index 08e6801..b41c363 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoLiveEvent.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoLiveEvent.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.util.Log import androidx.annotation.MainThread diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoLocalCallback.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoLocalCallback.kt similarity index 98% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoLocalCallback.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoLocalCallback.kt index 10ab234..7ffddb3 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoLocalCallback.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoLocalCallback.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import com.google.gson.Gson import io.reactivex.SingleObserver diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoMusic.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoMusic.kt similarity index 94% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoMusic.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoMusic.kt index a4e52c4..d4fcc93 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoMusic.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoMusic.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.content.Context import android.media.MediaPlayer @@ -16,7 +16,7 @@ import android.util.Log * All rights reserved * */ -object FrogoMusic : IFrogoMusic{ +object FrogoMusic : IFrogoMusic { private val TAG = FrogoMusic::class.java.simpleName diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoNavigation.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoNavigation.kt similarity index 99% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoNavigation.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoNavigation.kt index ca6f907..ec660c0 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoNavigation.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoNavigation.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.app.Activity import android.content.Context diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoPreference.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoPreference.kt similarity index 98% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoPreference.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoPreference.kt index 5704cff..6e81833 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoPreference.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoPreference.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.content.Context import android.content.SharedPreferences diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoResponse.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoResponse.kt similarity index 96% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoResponse.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoResponse.kt index 9548c5f..17329cd 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoResponse.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoResponse.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk /* * Created by faisalamir on 26/07/21 diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoViewModel.kt b/frogosdk/src/main/java/com/frogobox/sdk/FrogoViewModel.kt similarity index 95% rename from frogosdk/src/main/java/com/frogobox/sdk/core/FrogoViewModel.kt rename to frogosdk/src/main/java/com/frogobox/sdk/FrogoViewModel.kt index f68665e..9478caa 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/FrogoViewModel.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/FrogoViewModel.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.app.Application import androidx.lifecycle.AndroidViewModel diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoActivity.kt b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoActivity.kt similarity index 97% rename from frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoActivity.kt rename to frogosdk/src/main/java/com/frogobox/sdk/IFrogoActivity.kt index 258e4e9..b973389 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoActivity.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoActivity.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.view.View import androidx.fragment.app.Fragment diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoComposeActivity.kt b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoComposeActivity.kt similarity index 92% rename from frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoComposeActivity.kt rename to frogosdk/src/main/java/com/frogobox/sdk/IFrogoComposeActivity.kt index 26744df..b7a2939 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoComposeActivity.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoComposeActivity.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk /* * Created by faisalamir on 23/08/21 diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoDate.kt b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoDate.kt similarity index 97% rename from frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoDate.kt rename to frogosdk/src/main/java/com/frogobox/sdk/IFrogoDate.kt index 0b13fb4..be86018 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoDate.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoDate.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk /* * Created by faisalamir on 28/07/21 diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoFragment.kt b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoFragment.kt similarity index 96% rename from frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoFragment.kt rename to frogosdk/src/main/java/com/frogobox/sdk/IFrogoFragment.kt index 54e0d38..35557e0 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoFragment.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoFragment.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.view.View import androidx.fragment.app.Fragment diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoFunc.kt b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoFunc.kt similarity index 97% rename from frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoFunc.kt rename to frogosdk/src/main/java/com/frogobox/sdk/IFrogoFunc.kt index ca0d4f1..ae5d17f 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoFunc.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoFunc.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.content.Context import java.util.ArrayList diff --git a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoMusic.kt b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoMusic.kt similarity index 94% rename from frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoMusic.kt rename to frogosdk/src/main/java/com/frogobox/sdk/IFrogoMusic.kt index 651b9bd..a46a444 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/core/IFrogoMusic.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/IFrogoMusic.kt @@ -1,4 +1,4 @@ -package com.frogobox.sdk.core +package com.frogobox.sdk import android.content.Context import android.media.MediaPlayer diff --git a/frogosdk/src/main/java/com/frogobox/sdk/view/FrogoAboutUsActivity.kt b/frogosdk/src/main/java/com/frogobox/sdk/view/FrogoAboutUsActivity.kt index 873b2f0..2a6bb62 100644 --- a/frogosdk/src/main/java/com/frogobox/sdk/view/FrogoAboutUsActivity.kt +++ b/frogosdk/src/main/java/com/frogobox/sdk/view/FrogoAboutUsActivity.kt @@ -2,7 +2,7 @@ package com.frogobox.sdk.view import android.os.Bundle import com.frogobox.sdk.R -import com.frogobox.sdk.core.FrogoActivity +import com.frogobox.sdk.FrogoActivity import com.frogobox.sdk.databinding.ActivityFrogoAboutUsBinding import java.util.* diff --git a/settings.gradle.kts b/settings.gradle.kts index a5555b3..13cd7b6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,7 @@ pluginManagement { gradlePluginPortal() google() mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven { url = uri("https://jitpack.io") } } } @@ -12,9 +13,11 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven { url = uri("https://jitpack.io") } } } rootProject.name = "FrogoSDK" -include(":app", ":frogosdk") \ No newline at end of file +include(":app", ":frogosdk") +include(":frogocoresdk")