Skip to content

Commit

Permalink
Merge pull request #599 from openmobilemaps/bugfix/missing-header
Browse files Browse the repository at this point in the history
Move missing header file
  • Loading branch information
maerki authored Feb 16, 2024
2 parents 852a1d0 + 5e8854e commit 79dcb01
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 21 deletions.
25 changes: 5 additions & 20 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,16 @@ buildscript {
}

ext{
agp_version = "8.1.4"
kotlin_version = "1.9.20"
ksp_version = "1.9.20-1.0.13"

ubiqueUrl = System.getenv('UBIQUE_ARTIFACTORY_URL') ?: readPropertyWithDefault('ubiqueArtifactoryUrl', '')
ubiqueUser = System.getenv('UBIQUE_ARTIFACTORY_USER') ?: readPropertyWithDefault('ubiqueArtifactoryUser', '')
ubiquePass = System.getenv('UBIQUE_ARTIFACTORY_PASS') ?: readPropertyWithDefault('ubiqueArtifactoryPass', '')
ubiqueMaven = {
url = ubiqueUrl
credentials {
username = ubiqueUser
password = ubiquePass
}
authentication {
basic(BasicAuthentication)
digest(DigestAuthentication)
}
}
}
repositories {
google()
maven ubiqueMaven
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "com.android.tools.build:gradle:$agp_version"
classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$ksp_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

Expand Down Expand Up @@ -193,13 +178,13 @@ mavenPublishing {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.annotation:annotation:1.7.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.annotation:annotation:1.7.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'

implementation 'com.squareup.moshi:moshi:1.15.0'
ksp 'com.squareup.moshi:moshi-kotlin-codegen:1.15.0'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'

implementation 'ch.ubique.android:djinni-support-lib:1.0.6'

Expand Down
1 change: 0 additions & 1 deletion ios/maps/Layers/CapabilitiesResource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//

import Foundation
import UBFoundation

@available(iOS 13.0, *)
public class CapabilitiesResource {
Expand Down
File renamed without changes.

0 comments on commit 79dcb01

Please sign in to comment.