Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: maplibre android 11.6.0 #125

Merged
merged 8 commits into from
Nov 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ jobs:
arch: x86_64
emulator-boot-timeout: 1800 # 30 minutes
script: cd example && flutter test integration_test -r expanded --timeout=none --coverage --coverage-package maplibre
- name: "Install coverde"
run: dart pub global activate coverde
- name: "Prepare coverage data"
run: coverde value -i coverage/lcov.info > coverage/result.txt
- name: "Run Codecov"
uses: codecov/codecov-action@v4
if: ${{ matrix.api-level == '34' }}
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ android {
dependencies {
// JNIGEN implementation project(":MapLibreAndroid")
// JNIGEN implementation 'com.google.code.gson:gson:2.11.0'
implementation 'org.maplibre.gl:android-sdk:11.5.2' // JNIGEN
implementation 'org.maplibre.gl:android-sdk:11.6.0' // JNIGEN
// JNIGEN implementation 'org.maplibre.gl:maplibre-android-gestures:0.0.3'
// JNIGEN implementation 'org.maplibre.gl:android-sdk-geojson:6.0.1'
// JNIGEN implementation 'org.maplibre.gl:android-sdk-turf:6.0.1'
Expand Down
4 changes: 4 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ignore:
- "**/*.g.dart"
- "lib/src/native/jni"
- "example"
2 changes: 1 addition & 1 deletion example/android/MapLibreAndroid/build.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
configurations.maybeCreate("default")
artifacts.add("default", file('android-sdk-11.5.2.aar'))
artifacts.add("default", file('android-sdk-11.6.0.aar'))
Original file line number Diff line number Diff line change
Expand Up @@ -129,58 +129,6 @@ class MapLibreRegistry extends _$jni.JObject {
.check();
}

static final _id_getActivityPluginBinding = _class.instanceMethodId(
r'getActivityPluginBinding',
r'()Lio/flutter/embedding/engine/plugins/activity/ActivityPluginBinding;',
);

static final _getActivityPluginBinding = _$jni.ProtectedJniExtensions.lookup<
_$jni.NativeFunction<
_$jni.JniResult Function(
_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr,
)>>('globalEnv_CallObjectMethod')
.asFunction<
_$jni.JniResult Function(
_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr,
)>();

/// from: `public final io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding getActivityPluginBinding()`
/// The returned object must be released after use, by calling the [release] method.
_$jni.JObject getActivityPluginBinding() {
return _getActivityPluginBinding(reference.pointer,
_id_getActivityPluginBinding as _$jni.JMethodIDPtr)
.object(const _$jni.JObjectType());
}

static final _id_setActivityPluginBinding = _class.instanceMethodId(
r'setActivityPluginBinding',
r'(Lio/flutter/embedding/engine/plugins/activity/ActivityPluginBinding;)V',
);

static final _setActivityPluginBinding = _$jni.ProtectedJniExtensions.lookup<
_$jni.NativeFunction<
_$jni.JThrowablePtr Function(
_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr,
_$jni.VarArgs<(_$jni.Pointer<_$jni.Void>,)>)>>(
'globalEnv_CallVoidMethod')
.asFunction<
_$jni.JThrowablePtr Function(_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr, _$jni.Pointer<_$jni.Void>)>();

/// from: `public final void setActivityPluginBinding(io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding activityPluginBinding)`
void setActivityPluginBinding(
_$jni.JObject activityPluginBinding,
) {
_setActivityPluginBinding(
reference.pointer,
_id_setActivityPluginBinding as _$jni.JMethodIDPtr,
activityPluginBinding.reference.pointer)
.check();
}

static final _id_getActivity = _class.instanceMethodId(
r'getActivity',
r'()Landroid/app/Activity;',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6535,6 +6535,65 @@ class PropertyFactory extends _$jni.JObject {
.object(const propertyvalue_.$PropertyValue$Type(_$jni.JObjectType()));
}

static final _id_textVariableAnchorOffset = _class.staticMethodId(
r'textVariableAnchorOffset',
r'([Ljava/lang/Object;)Lorg/maplibre/android/style/layers/PropertyValue;',
);

static final _textVariableAnchorOffset = _$jni.ProtectedJniExtensions.lookup<
_$jni.NativeFunction<
_$jni.JniResult Function(
_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr,
_$jni.VarArgs<(_$jni.Pointer<_$jni.Void>,)>)>>(
'globalEnv_CallStaticObjectMethod')
.asFunction<
_$jni.JniResult Function(_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr, _$jni.Pointer<_$jni.Void>)>();

/// from: `static public org.maplibre.android.style.layers.PropertyValue textVariableAnchorOffset(java.lang.Object[] objects)`
/// The returned object must be released after use, by calling the [release] method.
static propertyvalue_.PropertyValue<_$jni.JArray<_$jni.JObject>>
textVariableAnchorOffset(
_$jni.JArray<_$jni.JObject> objects,
) {
return _textVariableAnchorOffset(
_class.reference.pointer,
_id_textVariableAnchorOffset as _$jni.JMethodIDPtr,
objects.reference.pointer)
.object(const propertyvalue_.$PropertyValue$Type(
_$jni.JArrayType(_$jni.JObjectType())));
}

static final _id_textVariableAnchorOffset$1 = _class.staticMethodId(
r'textVariableAnchorOffset',
r'(Lorg/maplibre/android/style/expressions/Expression;)Lorg/maplibre/android/style/layers/PropertyValue;',
);

static final _textVariableAnchorOffset$1 =
_$jni.ProtectedJniExtensions.lookup<
_$jni.NativeFunction<
_$jni.JniResult Function(
_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr,
_$jni.VarArgs<(_$jni.Pointer<_$jni.Void>,)>)>>(
'globalEnv_CallStaticObjectMethod')
.asFunction<
_$jni.JniResult Function(_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr, _$jni.Pointer<_$jni.Void>)>();

/// from: `static public org.maplibre.android.style.layers.PropertyValue textVariableAnchorOffset(org.maplibre.android.style.expressions.Expression expression)`
/// The returned object must be released after use, by calling the [release] method.
static propertyvalue_.PropertyValue<_$jni.JObject> textVariableAnchorOffset$1(
_$jni.JObject expression,
) {
return _textVariableAnchorOffset$1(
_class.reference.pointer,
_id_textVariableAnchorOffset$1 as _$jni.JMethodIDPtr,
expression.reference.pointer)
.object(const propertyvalue_.$PropertyValue$Type(_$jni.JObjectType()));
}

static final _id_textAnchor = _class.staticMethodId(
r'textAnchor',
r'(Ljava/lang/String;)Lorg/maplibre/android/style/layers/PropertyValue;',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,34 @@ class SymbolLayer extends layer_.Layer {
_$jni.JArrayType(_$jni.JStringType())));
}

static final _id_getTextVariableAnchorOffset = _class.instanceMethodId(
r'getTextVariableAnchorOffset',
r'()Lorg/maplibre/android/style/layers/PropertyValue;',
);

static final _getTextVariableAnchorOffset =
_$jni.ProtectedJniExtensions.lookup<
_$jni.NativeFunction<
_$jni.JniResult Function(
_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr,
)>>('globalEnv_CallObjectMethod')
.asFunction<
_$jni.JniResult Function(
_$jni.Pointer<_$jni.Void>,
_$jni.JMethodIDPtr,
)>();

/// from: `public org.maplibre.android.style.layers.PropertyValue getTextVariableAnchorOffset()`
/// The returned object must be released after use, by calling the [release] method.
propertyvalue_.PropertyValue<_$jni.JArray<_$jni.JObject>>
getTextVariableAnchorOffset() {
return _getTextVariableAnchorOffset(reference.pointer,
_id_getTextVariableAnchorOffset as _$jni.JMethodIDPtr)
.object(const propertyvalue_.$PropertyValue$Type(
_$jni.JArrayType(_$jni.JObjectType())));
}

static final _id_getTextAnchor = _class.instanceMethodId(
r'getTextAnchor',
r'()Lorg/maplibre/android/style/layers/PropertyValue;',
Expand Down