Merge pull request #9 from aminography/develop

Removed dependency to threetenbp.
aminography · Dec 29, 2021 · 6e5aafe · 6e5aafe
2 parents 12bdbbe + 6d66796
commit 6e5aafe
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Add the following lines to your `build.gradle` file:
 
 ```gradle
 dependencies {
-    implementation 'com.aminography:primecalendar:1.4.1'
+    implementation 'com.aminography:primecalendar:1.5.0'
 }
 ```
 
@@ -39,7 +39,7 @@ Add the following lines to your `pom.xml` file:
     <dependency>
         <groupId>com.aminography</groupId>
         <artifactId>primecalendar</artifactId>
-        <version>1.4.1</version>
+        <version>1.5.0</version>
     </dependency>
 </dependencies>
 ```

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,6 @@ buildscript {
     }
 
     dependencies {
-        classpath plugin.android.gradle
         classpath plugin.jetbrains.kotlin
         classpath plugin.jetbrains.dokka
         classpath plugin.nexus.publish

diff --git a/library/build.gradle b/library/build.gradle
@@ -11,7 +11,6 @@ compileTestKotlin {
 }
 
 dependencies {
-    implementation dep.threetenbp
     testImplementation dep.junit.core
 }
 

diff --git a/library/src/main/java/com/aminography/primecalendar/hijri/HijriCalendar.kt b/library/src/main/java/com/aminography/primecalendar/hijri/HijriCalendar.kt
@@ -154,5 +154,4 @@ class HijriCalendar @JvmOverloads constructor(
         const val DHU_AL_QADAH = 10
         const val DHU_AL_HIJJAH = 11
     }
-
 }
diff --git a/library/src/main/java/com/aminography/primecalendar/hijri/HijriCalendarUtils.kt b/library/src/main/java/com/aminography/primecalendar/hijri/HijriCalendarUtils.kt
@@ -2,9 +2,9 @@ package com.aminography.primecalendar.hijri
 
 import com.aminography.primecalendar.common.DateHolder
 import com.aminography.primecalendar.hijri.HijriCalendar.Companion.DEFAULT_LOCALE
-import org.threeten.bp.LocalDate
-import org.threeten.bp.chrono.HijrahDate
-import org.threeten.bp.temporal.ChronoField
+import java.time.LocalDate
+import java.time.chrono.HijrahDate
+import java.time.temporal.ChronoField
 import java.util.*
 import java.util.Calendar.*
 
@@ -241,4 +241,4 @@ object HijriCalendarUtils {
         return DateHolder(gregorianDate.get(ChronoField.YEAR), gregorianDate.get(ChronoField.MONTH_OF_YEAR) - 1, gregorianDate.get(ChronoField.DAY_OF_MONTH))
     }
 
-}
+}
diff --git a/library/src/test/java/com/aminography/primecalendar/ExampleUnitTest.kt b/library/src/test/java/com/aminography/primecalendar/ExampleUnitTest.kt
@@ -275,7 +275,7 @@ class ExampleUnitTest {
         println(persian.longDateString)
 
         val hijri = HijriCalendar()
-        println(persian.longDateString)
+        println(hijri.longDateString)
 
         println("${persian < hijri}")
     }

diff --git a/scripts/versions.gradle b/scripts/versions.gradle
@@ -1,8 +1,8 @@
 // semantic versioning
 def semantic = [
         'major': 1,
-        'minor': 4,
-        'patch': 1,
+        'minor': 5,
+        'patch': 0,
 ]
 ext.libVersion = [
         'code': semantic.major * 1000000 + semantic.minor * 1000 + semantic.patch,
@@ -13,7 +13,4 @@ ext.libVersion = [
 ext.versions = [
         'javaTarget'     : JavaVersion.VERSION_1_8,
         'kotlinJvmTarget': '1.8',
-        'compileSdk'     : 31,
-        'targetSdk'      : 31,
-        'minSdk'         : 15,
 ]
diff --git a/settings.gradle b/settings.gradle
@@ -5,20 +5,10 @@ enableFeaturePreview('VERSION_CATALOGS')
 dependencyResolutionManagement {
     versionCatalogs {
         dep {
-            alias('threetenbp').to('org.threeten:threetenbp:1.4.0')
-
-            alias('androidx-appcompat').to('androidx.appcompat:appcompat:1.4.0')
-            alias('android-material').to('com.google.android.material:material:1.4.0')
-            bundle('ui', ['androidx-appcompat', 'android-material'])
-
             alias('junit-core').to('junit:junit:4.13.2')
-            alias('androidx-junit').to('androidx.test.ext:junit:1.1.3')
-            alias('androidx-espresso').to('androidx.test.espresso:espresso-core:3.4.0')
-            bundle('androidTest', ['androidx-junit', 'androidx-espresso'])
         }
 
         plugin {
-            alias('android-gradle').to('com.android.tools.build:gradle:7.0.4')
             alias('jetbrains-kotlin').to('org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10')
             alias('jetbrains-dokka').to('org.jetbrains.dokka:dokka-gradle-plugin:1.5.0')
             alias('nexus-publish').to('io.github.gradle-nexus:publish-plugin:1.1.0')