diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 66b05f8..1e0bd42 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -41,12 +41,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" - } - packaging { - resources { - excludes += "/META-INF/{AL2.0,LGPL2.1}" - } + kotlinCompilerExtensionVersion = "1.4.8" } } diff --git a/app/src/main/java/com/loftymr/countrycodepicker/MainActivity.kt b/app/src/main/java/com/loftymr/countrycodepicker/MainActivity.kt index cc5dd5c..407ec9e 100644 --- a/app/src/main/java/com/loftymr/countrycodepicker/MainActivity.kt +++ b/app/src/main/java/com/loftymr/countrycodepicker/MainActivity.kt @@ -19,8 +19,8 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp +import com.loftymr.countrycodepicker.ui.theme.CountryCodePickerTheme import com.loftymr.countrycp.CountryCP -import com.loftymr.countrycp.ui.theme.CountryCodePickerTheme import com.loftymr.countrycp.utils.EMPTY_STRING import com.loftymr.countrycp.utils.isPhoneNumberValid diff --git a/countrycp/build.gradle.kts b/countrycp/build.gradle.kts index ba23413..c846a37 100644 --- a/countrycp/build.gradle.kts +++ b/countrycp/build.gradle.kts @@ -39,7 +39,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" + kotlinCompilerExtensionVersion = "1.4.8" } } @@ -66,7 +66,7 @@ afterEvaluate { register("release") { groupId = "com.github.tfaki" artifactId = "countrycp" - version = "1.0.1" + version = "1.0.2" from(components["release"]) } diff --git a/countrycp/src/main/AndroidManifest.xml b/countrycp/src/main/AndroidManifest.xml deleted file mode 100644 index a5918e6..0000000 --- a/countrycp/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/countrycp/src/main/java/com/loftymr/countrycp/Country.kt b/countrycp/src/main/java/com/loftymr/countrycp/Country.kt index 0274bc6..6b9152c 100644 --- a/countrycp/src/main/java/com/loftymr/countrycp/Country.kt +++ b/countrycp/src/main/java/com/loftymr/countrycp/Country.kt @@ -247,6 +247,6 @@ enum class Country( Zimbabwe("ZW", "+263"); companion object { - val countryList = entries.toList() + val countryList = enumValues().toList() } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9a46f7..256dd2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,22 +1,18 @@ [versions] -agp = "8.3.0-alpha12" -gradle = "8.3.0-alpha12" -kotlin = "1.9.0" +agp = "7.3.0" +kotlin = "1.8.22" coreKtx = "1.12.0" junit = "4.13.2" junitVersion = "1.1.5" espressoCore = "3.5.1" -kotlinGradlePlugin = "1.7.20" lifecycleRuntimeKtx = "2.6.2" activityCompose = "1.8.1" composeBom = "2023.08.00" libPhoneNumber = "8.13.25" -appcompat = "1.6.1" -material = "1.10.0" +material3 = "1.1.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" } junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } @@ -30,10 +26,7 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-material3 = { group = "androidx.compose.material3", name = "material3" } -kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } libPhoneNumber = { group = "com.googlecode.libphonenumber", name = "libphonenumber", version.ref = "libPhoneNumber"} -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } diff --git a/settings.gradle.kts b/settings.gradle.kts index c1afc16..a2047f2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,10 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { + url = uri("http://jitpack.io") + isAllowInsecureProtocol = true + } } }