fix: Fixed ios build.
This commit is contained in:
parent
78d87ad52a
commit
86a30f647d
49
.drone.yml
49
.drone.yml
@ -3,35 +3,38 @@ type: docker
|
|||||||
name: test
|
name: test
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Lint
|
||||||
|
failure: ignore
|
||||||
|
image: mingc/android-build-box:latest
|
||||||
|
commands:
|
||||||
|
- echo "---------------------------------------------------------"
|
||||||
|
- echo "Install linters..."
|
||||||
|
- curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
|
||||||
|
- curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
|
||||||
|
- echo "---------------------------------------------------------"
|
||||||
|
- echo "Linting..."
|
||||||
|
- ktlint || true
|
||||||
|
- echo "---------------------------------------------------------"
|
||||||
|
- echo "Detecting..."
|
||||||
|
- ./detekt-cli-1.23.1/bin/detekt-cli --all-rules || true
|
||||||
|
- echo "---------------------------------------------------------"
|
||||||
|
command_timeout: 1m
|
||||||
- name: BuildAndTest
|
- name: BuildAndTest
|
||||||
image: mingc/android-build-box:latest
|
image: mingc/android-build-box:latest
|
||||||
commands:
|
commands:
|
||||||
- echo "---------------------------------------------------------"
|
- echo "---------------------------------------------------------"
|
||||||
- echo "Configure gradle..."
|
- echo "Configure gradle..."
|
||||||
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
||||||
- echo "---------------------------------------------------------"
|
- echo "---------------------------------------------------------"
|
||||||
- echo "Building..."
|
- echo "Configure java..."
|
||||||
- ./gradlew build -x test
|
- . ~/.bash_profile
|
||||||
|
- jenv global 17.0
|
||||||
|
- java --version
|
||||||
|
- date
|
||||||
- echo "---------------------------------------------------------"
|
- echo "---------------------------------------------------------"
|
||||||
- echo "Testing..."
|
- echo "Building and testing..."
|
||||||
|
- ./gradlew build
|
||||||
- echo "---------------------------------------------------------"
|
- echo "---------------------------------------------------------"
|
||||||
- ./gradlew koverMergedXmlReport
|
|
||||||
environment:
|
|
||||||
TZ: Europe/Paris
|
|
||||||
SONAR_HOST_URL:
|
|
||||||
from_secret: sonarScannerHostUrl
|
|
||||||
SONAR_LOGIN:
|
|
||||||
from_secret: sonarScannerLogin
|
|
||||||
- name: Analyse
|
|
||||||
image: kytay/sonar-node-plugin
|
|
||||||
settings:
|
|
||||||
sonar_host:
|
|
||||||
from_secret: sonarScannerHostUrl
|
|
||||||
sonar_token:
|
|
||||||
from_secret: sonarScannerLogin
|
|
||||||
use_node_version: 16.18.1
|
|
||||||
sonar_debug: true
|
|
||||||
sonar_project_settings: ./sonar-project.properties
|
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- push
|
- push
|
||||||
@ -107,10 +110,10 @@ steps:
|
|||||||
- git fetch --tags
|
- git fetch --tags
|
||||||
- echo "---------------------------------------------------------"
|
- echo "---------------------------------------------------------"
|
||||||
- echo "Configure gradle..."
|
- echo "Configure gradle..."
|
||||||
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
||||||
- echo "---------------------------------------------------------"
|
- echo "---------------------------------------------------------"
|
||||||
- echo "Generate APK"
|
- echo "Generate APK"
|
||||||
- ./gradlew :androidApp:assembleGithubConfigRelease -P pushCache=false
|
- ./gradlew :androidApp:assembleGithubConfigRelease
|
||||||
- echo "---------------------------------------------------------"
|
- echo "---------------------------------------------------------"
|
||||||
- echo "Get Key"
|
- echo "Get Key"
|
||||||
- wget https://amine-louveau.fr/key
|
- wget https://amine-louveau.fr/key
|
||||||
|
@ -26,4 +26,3 @@ org.gradle.parallel=true
|
|||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
ignoreGitVersion=false
|
ignoreGitVersion=false
|
||||||
kotlin.native.cacheKind.iosX64=none
|
kotlin.native.cacheKind.iosX64=none
|
||||||
pushCache=true
|
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
val pushCache: String by settings
|
|
||||||
|
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
// maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
|
// maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
|
||||||
@ -17,17 +15,6 @@ dependencyResolutionManagement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
buildCache {
|
|
||||||
remote<HttpBuildCache> {
|
|
||||||
url = uri("http://18.0.0.7:3071/cache/")
|
|
||||||
isAllowInsecureProtocol = true
|
|
||||||
isAllowUntrustedServer = true
|
|
||||||
isUseExpectContinue = true
|
|
||||||
isPush = (pushCache == "true")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.name = "ReaderForSelfossV2"
|
rootProject.name = "ReaderForSelfossV2"
|
||||||
include(":androidApp")
|
include(":androidApp")
|
||||||
include(":shared")
|
include(":shared")
|
@ -0,0 +1,6 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.rest
|
||||||
|
|
||||||
|
import io.ktor.client.engine.cio.CIOEngineConfig
|
||||||
|
|
||||||
|
actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
|
||||||
|
}
|
@ -0,0 +1,6 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.rest
|
||||||
|
|
||||||
|
import io.ktor.client.engine.cio.CIOEngineConfig
|
||||||
|
|
||||||
|
actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user