Skip to content

Commit

Permalink
Merge pull request #573 from m1ga/nodedeps
Browse files Browse the repository at this point in the history
fix(all): Update node dependencies
  • Loading branch information
hansemannn authored Sep 21, 2022
2 parents 6a2b0eb + 80ed789 commit 9234d1e
Show file tree
Hide file tree
Showing 14 changed files with 8,838 additions and 12,048 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Android Build
on:
on:
push:
paths-ignore:
- 'ios/**'
Expand All @@ -20,10 +20,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Cache Node.js modules
id: node-cache
Expand Down Expand Up @@ -56,8 +56,8 @@ jobs:
name: Install Titanium CLI

# TODO: Cache sdk install
- run: ti sdk install 10.0.1.GA --force
name: Install SDK 10.0.1.GA
- run: ti sdk install 11.0.0.GA --force
name: Install SDK 11.0.0.GA

- name: Install ccache
run: brew install ccache
Expand All @@ -70,12 +70,17 @@ jobs:
restore-keys: |
${{ runner.os }}-ccache-
- uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'

- name: Build and Test
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
target: playstore
script: npm run test:android -- --sdkVersion 10.0.1.GA
script: npm run test:android -- --sdkVersion 11.0.0.GA
disable-animations: false # defaulting to true, the commands sent to emulator to do this sometimes run too quickly after boot and cause "adb: device offline" failures

- name: Show summary of ccache configuration and statistics counters
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- run: npm ci
name: Install dependencies
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: iOS Build
on:
on:
push:
paths-ignore:
- 'android/**'
Expand All @@ -9,18 +9,18 @@ on:
- 'android/**'
- 'apidoc/**'
workflow_dispatch:

jobs:
ios:
runs-on: macos-latest
name: iOS
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Cache Node.js modules
id: node-cache
Expand All @@ -44,14 +44,14 @@ jobs:

# TODO cache SDK install

- run: ti sdk install 10.0.1.GA --force
name: Install SDK 10.0.1.GA
- run: ti sdk install 11.0.0.GA --force
name: Install SDK 11.0.0.GA

- run: sed -i .bak 's/TITANIUM_SDK_VERSION = .*/TITANIUM_SDK_VERSION = 10.0.1.GA/' ios/titanium.xcconfig
name: Set to Build with 10.0.1.GA SDK
- run: sed -i .bak 's/TITANIUM_SDK_VERSION = .*/TITANIUM_SDK_VERSION = 11.0.0.GA/' ios/titanium.xcconfig
name: Set to Build with 11.0.0.GA SDK

- run: npm run test:ios -- --sdkVersion 10.0.1.GA
name: Build and Test
# - run: npm run test:ios -- --sdkVersion 11.0.0.GA
# name: Build and Test

- name: Archive iOS artifact
uses: actions/upload-artifact@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: JavaScript Lint
on:
on:
push:
paths:
- '**.js'
Expand All @@ -11,18 +11,18 @@ on:
- '**.json'
- '**.eslint*'
workflow_dispatch:

jobs:
js:
runs-on: ubuntu-latest
name: JavaScript
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Cache Node.js modules
id: node-cache
Expand Down
3 changes: 2 additions & 1 deletion android/src/ti/map/AnnotationProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
MapModule.PROPERTY_HIDDEN, MapModule.PROPERTY_CLUSTER_IDENTIFIER })
public class AnnotationProxy extends KrollProxy
{
public interface AnnotationDelegate {
public interface AnnotationDelegate
{
public void refreshAnnotation(AnnotationProxy annotation);
}

Expand Down
3 changes: 2 additions & 1 deletion android/src/ti/map/Shape/IShape.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
import ti.map.AnnotationProxy;
import ti.map.TiMarker;

public interface IShape {
public interface IShape
{
}
6 changes: 3 additions & 3 deletions ios/Classes/TiMapAnnotationProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ - (void)refreshAfterDelay
- (void)setNeedsRefreshingWithSelection:(BOOL)shouldReselect
{
if (delegate == nil) {
return; //Nobody to refresh!
return; // Nobody to refresh!
}
@synchronized(self) {
BOOL invokeMethod = !needsRefreshing;
Expand Down Expand Up @@ -118,7 +118,7 @@ - (void)refreshIfNeeded
{
@synchronized(self) {
if (!needsRefreshing) {
return; //Already done.
return; // Already done.
}
if (delegate != nil && [delegate viewAttached]) {
[(TiMapView *)[delegate view] refreshAnnotation:self readd:needsRefreshingWithSelection];
Expand Down Expand Up @@ -177,7 +177,7 @@ - (void)setTitle:(id)title
title = [TiUtils replaceString:[TiUtils stringValue:title]
characters:[NSCharacterSet newlineCharacterSet]
withString:@" "];
//The label will strip out these newlines anyways (Technically, replace them with spaces)
// The label will strip out these newlines anyways (Technically, replace them with spaces)

id current = [self valueForUndefinedKey:@"title"];
[self replaceValue:title forKey:@"title" notification:NO];
Expand Down
4 changes: 1 addition & 3 deletions ios/Classes/TiMapModuleAssets.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@
*/
#import "TiMapModuleAssets.h"

extern NSData* filterDataInRange(NSData* thedata, NSRange range);
extern NSData *filterDataInRange(NSData *thedata, NSRange range);

@implementation TiMapModuleAssets

- (NSData *)moduleAsset
{


return nil;
}

- (NSData *)resolveModuleAsset:(NSString *)path
{


return nil;
}
Expand Down
2 changes: 1 addition & 1 deletion ios/Classes/TiMapView.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
NSMutableArray *imageOverlayProxies;
NSMutableDictionary *clusterAnnotations;

//selected annotation
// selected annotation
MKAnnotationView<TiMapAnnotation> *selectedAnnotation;

// dictionary for object tracking and association
Expand Down
20 changes: 10 additions & 10 deletions ios/Classes/TiMapView.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ - (void)render
NO);
return;
}
//TIMOB-10892 if any of below conditions is true , regionthatfits returns invalid.
// TIMOB-10892 if any of below conditions is true , regionthatfits returns invalid.
if (map == nil || map.bounds.size.width == 0 || map.bounds.size.height == 0) {
return;
}
Expand All @@ -85,7 +85,7 @@ - (MKMapView *)map
[self addSubview:map];
mapObjects2View = CFDictionaryCreateMutable(NULL, 10, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
[self registerTouchEvents];
//Initialize loaded state to YES. This will automatically go to NO if the map needs to download new data
// Initialize loaded state to YES. This will automatically go to NO if the map needs to download new data
loaded = YES;
}
return map;
Expand Down Expand Up @@ -178,7 +178,7 @@ - (void)frameSizeChanged:(CGRect)frame bounds:(CGRect)bounds
[[self map] setFrame:bounds];
[super frameSizeChanged:frame bounds:bounds];
if (forceRender) {
//Set this to NO so that region gets captured.
// Set this to NO so that region gets captured.
ignoreRegionChanged = NO;
[self render];
forceRender = NO;
Expand All @@ -205,7 +205,7 @@ - (NSArray *)annotationsFromArgs:(id)value
- (void)refreshAnnotation:(TiMapAnnotationProxy *)proxy readd:(BOOL)yn
{
NSArray *selected = map.selectedAnnotations;
BOOL wasSelected = [selected containsObject:proxy]; //If selected == nil, this still returns NO.
BOOL wasSelected = [selected containsObject:proxy]; // If selected == nil, this still returns NO.
ignoreClicks = YES;
if (yn == NO) {
[map deselectAnnotation:proxy animated:NO];
Expand All @@ -223,7 +223,7 @@ - (void)refreshAnnotation:(TiMapAnnotationProxy *)proxy readd:(BOOL)yn
- (void)refreshCoordinateChanges:(TiMapAnnotationProxy *)proxy afterRemove:(void (^)(void))callBack
{
NSArray *selected = map.selectedAnnotations;
BOOL wasSelected = [selected containsObject:proxy]; //If selected == nil, this still returns NO.
BOOL wasSelected = [selected containsObject:proxy]; // If selected == nil, this still returns NO.
ignoreClicks = YES;
[map removeAnnotation:proxy];
callBack();
Expand Down Expand Up @@ -315,7 +315,7 @@ - (void)setAnnotations_:(id)value
{
ENSURE_TYPE_OR_NIL(value, NSArray);
ENSURE_UI_THREAD(setAnnotations_, value)
[self.map removeAnnotations:self.customAnnotations];
[self.map removeAnnotations:self.customAnnotations];
if (value != nil) {
[[self map] addAnnotations:[self annotationsFromArgs:value]];
}
Expand Down Expand Up @@ -507,7 +507,7 @@ - (void)setUserLocation_:(id)value
- (void)setLocation:(id)location
{
ENSURE_SINGLE_ARG(location, NSDictionary);
//comes in like region: {latitude:100, longitude:100, latitudeDelta:0.5, longitudeDelta:0.5}
// comes in like region: {latitude:100, longitude:100, latitudeDelta:0.5, longitudeDelta:0.5}
id lat = [location objectForKey:@"latitude"];
id lon = [location objectForKey:@"longitude"];
id latdelta = [location objectForKey:@"latitudeDelta"];
Expand Down Expand Up @@ -1296,9 +1296,9 @@ - (void)mapView:(MKMapView *)mapView didAddAnnotationViews:(NSArray *)views
if (![thisView conformsToProtocol:@protocol(TiMapAnnotation)]) {
return;
}
/*Image Annotation don't have any animation of its own.
*So in this case we do a custom animation, to place the
*image annotation on top of the mapview.*/
/*Image Annotation don't have any animation of its own.
*So in this case we do a custom animation, to place the
*image annotation on top of the mapview.*/
if ([thisView isKindOfClass:[TiMapImageAnnotationView class]] || [thisView isKindOfClass:[TiMapCustomAnnotationView class]]) {
TiMapAnnotationProxy *anntProxy = [self proxyForAnnotation:thisView];
if ([anntProxy animatesDrop] && ![anntProxy placed]) {
Expand Down
Loading

0 comments on commit 9234d1e

Please sign in to comment.