Skip to content

Commit

Permalink
remove plugins version
Browse files Browse the repository at this point in the history
  • Loading branch information
ank27 committed Feb 7, 2022
1 parent 9898c76 commit 4fe94fe
Show file tree
Hide file tree
Showing 11 changed files with 251 additions and 35 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Mapbox welcomes participation and contributions from everyone.

## Dependencies
* Update gl-native to v10.3.0, common to v21.1.0. ([#1105](https://github.com/mapbox/mapbox-maps-android/pull/1105))
* Update android gradle plugin to v7.0.4, gradle version to v7.0.2, Gradle licence plugin to 0.8.90, Added sdk versions plugin v1.1.3. ([#1118](https://github.com/mapbox/mapbox-maps-android/pull/1118))

# 10.3.0-rc.1 January 26, 2022

Expand Down
260 changes: 236 additions & 24 deletions LICENSE.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import androidx.car.app.Session;

import com.mapbox.maps.MapInitOptions;
import com.mapbox.maps.MapboxExperimental;
import com.mapbox.maps.extension.androidauto.MapSurfaceReadyCallback;
import com.mapbox.maps.extension.androidauto.OnMapScaleListener;
import com.mapbox.maps.extension.androidauto.OnMapScrollListener;

@MapboxExperimental
public class CarJavaInterfaceChecker {

private void carSession(Session session, MapInitOptions mapInitOptions,
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ buildscript {
classpath(Plugins.license)
classpath(Plugins.mapboxAccessToken)
classpath(Plugins.mapboxSdkRegistry)
classpath(Plugins.mapboxSdkVersionsPlugin)
}
}

Expand Down
6 changes: 2 additions & 4 deletions buildSrc/src/main/kotlin/Project.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ object Plugins {
const val license = "com.jaredsburrows:gradle-license-plugin:${Versions.pluginLicense}"
const val mapboxAccessToken = "com.mapbox.gradle.plugins:access-token:${Versions.mapboxAccessToken}"
const val mapboxSdkRegistry = "com.mapbox.gradle.plugins:sdk-registry:${Versions.mapboxSdkRegistry}"
const val mapboxSdkVersionsPlugin = "com.mapbox.mapboxsdk:mapbox-android-sdk-versions:${Versions.mapboxSdkVersionsPlugin}"
}

object Dependencies {
Expand Down Expand Up @@ -71,7 +70,7 @@ object Dependencies {
object Versions {
const val pluginAndroidGradle = "7.0.4"
const val pluginKotlin = "1.5.31"
const val pluginLicense = "0.8.5"
const val pluginLicense = "0.8.90"
const val pluginDokka = "1.4.10.2"
const val pluginJacoco = "0.2"
const val mapboxAccessToken="0.4.0"
Expand All @@ -88,7 +87,7 @@ object Versions {
const val androidxAppcompat = "1.3.0"
const val androidxTest = "1.3.0"
const val androidxConstraintLayout = "2.0.0"
const val androidxEspresso = "3.5.0"
const val androidxEspresso = "3.3.0"
const val androidxJUnit = "1.1.2"
const val androidxUiAutomator = "2.2.0"
const val androidxRecyclerView = "1.1.0"
Expand All @@ -109,5 +108,4 @@ object Versions {
const val hamcrest = "2.1"
const val equalsVerifier = "3.7"
const val asyncInflater = "1.0.0"
const val mapboxSdkVersionsPlugin = "1.1.3"
}
3 changes: 2 additions & 1 deletion extension-style-app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
android:label="extension-style-app"
android:supportsRtl="true"
android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
<activity android:name="androidx.appcompat.app.AppCompatActivity">
<activity android:name="androidx.appcompat.app.AppCompatActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
2 changes: 1 addition & 1 deletion gradle/lint.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ android {
checkReleaseBuilds false
warningsAsErrors true
xmlReport false
disable 'AllowBackup'
disable 'AllowBackup', 'UnusedResources'
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.mapbox.maps.plugin.animation.animator

import android.animation.TypeEvaluator
import android.animation.ValueAnimator
import android.annotation.SuppressLint
import com.mapbox.common.Logger
import com.mapbox.maps.CameraOptions
import com.mapbox.maps.plugin.animation.CameraAnimatorOptions
Expand All @@ -10,6 +11,7 @@ import com.mapbox.maps.plugin.animation.CameraAnimatorType
/**
* Base generic class for all camera animators.
*/
@SuppressLint("Recycle")
abstract class CameraAnimator<out T> (
/**
* [TypeEvaluator] for generic type
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import android.animation.Animator
import android.animation.AnimatorListenerAdapter
import android.animation.TypeEvaluator
import android.animation.ValueAnimator
import android.annotation.SuppressLint
import android.view.animation.LinearInterpolator
import androidx.annotation.VisibleForTesting
import androidx.annotation.VisibleForTesting.PRIVATE
import com.mapbox.maps.plugin.locationcomponent.LocationComponentConstants
import com.mapbox.maps.plugin.locationcomponent.LocationLayerRenderer

@SuppressLint("Recycle")
internal abstract class PuckAnimator<T>(
evaluator: TypeEvaluator<T>
) : ValueAnimator() {
Expand Down
1 change: 0 additions & 1 deletion sdk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
kotlin("android")
id("com.jaredsburrows.license")
id("org.jetbrains.dokka")
id("com.mapbox.android.sdk.versions")
}

android {
Expand Down
6 changes: 3 additions & 3 deletions sdk/src/main/java/com/mapbox/maps/FontUtils.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.mapbox.maps

import android.annotation.SuppressLint
import android.graphics.Typeface
import android.os.Build
import android.util.Log
Expand Down Expand Up @@ -27,9 +28,7 @@ internal object FontUtils {
*/
fun extractValidFont(font: String?): String {
var validFonts: List<String>? = null
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
validFonts = deviceFonts
}
validFonts = deviceFonts
if (validFonts == null || validFonts.isEmpty()) {
validFonts = DEFAULT_FONT_STACKS
}
Expand All @@ -46,6 +45,7 @@ internal object FontUtils {

@get:RequiresApi(Build.VERSION_CODES.LOLLIPOP)
private val deviceFonts: List<String>
@SuppressLint("DiscouragedPrivateApi")
get() {
val fonts: MutableList<String> = ArrayList()
try {
Expand Down

0 comments on commit 4fe94fe

Please sign in to comment.