Compare commits

...

5 Commits

Author SHA1 Message Date
Amine Louveau
77917dd940 Merge pull request 'drone' (#26) from drone into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/26
2022-08-16 19:10:52 +00:00
aminecmi
88f11762cb Can't be detached.
Some checks reported errors
continuous-integration/drone/push Build was killed
continuous-integration/drone/pr Build was killed
2022-08-16 21:09:28 +02:00
aminecmi
e3e6b6f8b8 Fixing build. 2022-08-16 21:09:28 +02:00
aminecmi
d0d285b315 Renaming file. 2022-08-16 21:09:27 +02:00
aminecmi
096344241d Drone. 2022-08-16 21:09:27 +02:00
4 changed files with 67 additions and 39 deletions

20
.drone.yml Normal file
View File

@ -0,0 +1,20 @@
kind: pipeline
type: docker
steps:
- name: build
image: mingc/android-build-box:latest
commands:
- ./gradlew build
- name: code-analysis
image: mingc/android-build-box:latest
failure: ignore
commands:
- ls -la
- ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.sources=. -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
environment:
SONAR_HOST_URL:
from_secret: sonarScannerHostUrl
SONAR_LOGIN:
from_secret: sonarScannerLogin

View File

@ -1,31 +1,32 @@
package bou.amine.apps.readerforselfossv2.android.utils // TODO
//package bou.amine.apps.readerforselfossv2.android.utils
import bou.amine.apps.readerforselfossv2.android.utils.Config //
import bou.amine.apps.readerforselfossv2.android.utils.parseDate //import bou.amine.apps.readerforselfossv2.android.utils.Config
import org.junit.Test //import bou.amine.apps.readerforselfossv2.android.utils.parseDate
//import org.junit.Test
class DateUtilsTest { //
//class DateUtilsTest {
@Test //
fun parseDateV4() { // @Test
// fun parseDateV4() {
Config.apiVersion = 4 //
val dateString = "2013-04-07T13:43:00+01:00" // Config.apiVersion = 4
// val dateString = "2013-04-07T13:43:00+01:00"
val milliseconds = parseDate(dateString).toEpochMilli() //
val correctMilliseconds : Long = 1365338580000 // val milliseconds = parseDate(dateString).toEpochMilli()
// val correctMilliseconds : Long = 1365338580000
assert(milliseconds == correctMilliseconds) //
} // assert(milliseconds == correctMilliseconds)
// }
@Test //
fun parseDateV1() { // @Test
Config.apiVersion = 0 // fun parseDateV1() {
val dateString = "2013-04-07 13:43:00" // Config.apiVersion = 0
// val dateString = "2013-04-07 13:43:00"
val milliseconds = parseDate(dateString).toEpochMilli() //
val correctMilliseconds = 1365342180000 // val milliseconds = parseDate(dateString).toEpochMilli()
// val correctMilliseconds = 1365342180000
assert(milliseconds == correctMilliseconds) //
} // assert(milliseconds == correctMilliseconds)
} // }
//}

View File

@ -6,10 +6,15 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
classpath("com.android.tools.build:gradle:7.2.0") classpath("com.android.tools.build:gradle:7.2.1")
// sonarquve
classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513")
} }
} }
apply(plugin = "org.sonarqube")
allprojects { allprojects {
repositories { repositories {
google() google()

View File

@ -1,6 +1,6 @@
package bou.amine.apps.readerforselfossv2.utils package bou.amine.apps.readerforselfossv2.utils
import android.text.format.DateUtils //import android.text.format.DateUtils
import bou.amine.apps.readerforselfossv2.rest.SelfossModel import bou.amine.apps.readerforselfossv2.rest.SelfossModel
import java.time.Instant import java.time.Instant
import java.time.LocalDateTime import java.time.LocalDateTime
@ -30,11 +30,13 @@ class DateUtils(private val apiMajorVersion: Int) {
val date = parseDate(dateString) val date = parseDate(dateString)
return " " + DateUtils.getRelativeTimeSpanString( // TODO:
date.toEpochMilli(), // return " " + DateUtils.getRelativeTimeSpanString(
Instant.now().toEpochMilli(), // date.toEpochMilli(),
60000L, // DateUtils.MINUTE_IN_MILLIS, // Instant.now().toEpochMilli(),
262144 // DateUtils.FORMAT_ABBREV_RELATIVE // 60000L, // DateUtils.MINUTE_IN_MILLIS,
) // 262144 // DateUtils.FORMAT_ABBREV_RELATIVE
// )
return dateString
} }
} }