Skip to content

remove deprecated override #2

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.

Sign up for GitHub

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

Open
gwmccull wants to merge 7 commits into
base: master
Choose a base branch
from
Open

remove deprecated override #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c49d7b
remove deprecated override
gwmccull Dec 26, 2018
4407b68
update url to be full url
gwmccull Jan 24, 2019
bc9780d
update build version
gwmccull Jan 31, 2019
f1f2984
update build.gradle
gwmccull Mar 15, 2019
c7a87e1
move podspec and update folder name
gwmccull Jul 22, 2019
eb247ca
move podspec and update folder name
gwmccull Jul 22, 2019
2d2344f
add homepage attribute to podscpec
gwmccull Jul 22, 2019
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
6 changes: 3 additions & 3 deletions ios/RNAlooma.podspec → RNAlooma.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Pod::Spec.new do |s|
s.description = <<-DESC
RNAlooma
DESC
s.homepage = ""
s.homepage = "https://github.com/Countable-us/react-native-alooma"
s.license = "MIT"
# s.license = { :type => "MIT", :file => "FILE_LICENSE" }
s.author = { "author" => "author@domain.cn" }
s.platform = :ios, "7.0"
s.source = { :git => "https://github.com/author/RNAlooma.git", :tag => "master" }
s.source_files = "RNAlooma/**/*.{h,m}"
s.source_files = "ios/**/*.{h,m}"
s.requires_arc = true


Expand All @@ -21,4 +21,4 @@ Pod::Spec.new do |s|

end



14 changes: 8 additions & 6 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ buildscript {

apply plugin: 'com.android.library'

def DEFAULT_COMPILE_SDK_VERSION = 28
def DEFAULT_TARGET_SDK_VERSION = 26

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION

defaultConfig {
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
versionCode 1
versionName "1.0"
}
Expand All @@ -31,8 +33,8 @@ repositories {
}

dependencies {
compile 'com.facebook.react:react-native:+'
compile "com.github.aloomaio.androidsdk:androidsdk:6.0.2"
compile 'com.google.android.gms:play-services-gcm:11.0.4'
implementation 'com.facebook.react:react-native:+'
implementation "com.github.aloomaio.androidsdk:androidsdk:6.0.2"
implementation 'com.google.android.gms:play-services-gcm:11.0.4'
}

1 change: 0 additions & 1 deletion android/src/main/java/com/countable/alooma/RNAloomaPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
return Arrays.<NativeModule>asList(new RNAloomaModule(reactContext));
}

@Override
public List<Class<? extends JavaScriptModule>> createJSModules() {
return Collections.emptyList();
}
Expand Down
2 changes: 1 addition & 1 deletion ios/RNAlooma.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ - (dispatch_queue_t)methodQueue
RCT_EXPORT_MODULE(RNAlooma)

RCT_EXPORT_METHOD(sharedInstanceWithToken:(NSString *)apiToken) {
[Alooma sharedInstanceWithToken:apiToken serverURL:@"inputs.alooma.com"
[Alooma sharedInstanceWithToken:apiToken serverURL:@"https://inputs.alooma.com"
];
alooma = [Alooma sharedInstance];
// React Native runs too late to listen for applicationDidBecomeActive,
Expand Down