Skip to content

Commit

Permalink
Update Android plugin Gradle configuration
Browse files Browse the repository at this point in the history
We require a very recent Kotlin version (1.9.0) due to MapLibre native dependency.
These changes ensure that the plugin requires the same version.
Also remove unused imports.
  • Loading branch information
kuhnroyal committed Jun 10, 2024
1 parent e84442c commit 47aaaf6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
8 changes: 5 additions & 3 deletions maplibre_gl/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ group 'org.maplibre.maplibregl'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

Expand All @@ -20,15 +22,15 @@ rootProject.allprojects {
}

apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
apply plugin: 'kotlin-android'

android {
if (project.android.hasProperty("namespace")) {
namespace 'org.maplibre.maplibregl'
}

compileSdkVersion 34
ndkVersion "20.1.5948944"
ndkVersion "26.1.10909125"

defaultConfig {
minSdkVersion 21
Expand Down
3 changes: 1 addition & 2 deletions maplibre_gl/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sat Mar 06 23:07:28 CET 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@

package org.maplibre.maplibregl;

import android.app.Activity;
import android.app.Application;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LifecycleRegistry;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
import io.flutter.embedding.engine.plugins.lifecycle.HiddenLifecycleReference;
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.PluginRegistry.Registrar;

/**
* Plugin for controlling a set of MapLibreMap views to be shown as overlays on top of the Flutter
Expand All @@ -27,8 +21,6 @@
*/
public class MapLibreMapsPlugin implements FlutterPlugin, ActivityAware {

private static final String VIEW_TYPE = "plugins.flutter.io/maplibre_gl";

static FlutterAssets flutterAssets;
private Lifecycle lifecycle;

Expand Down

0 comments on commit 47aaaf6

Please sign in to comment.