diff --git a/ios/RNAlooma.podspec b/RNAlooma.podspec similarity index 82% rename from ios/RNAlooma.podspec rename to RNAlooma.podspec index 19b1e76..690c1cb 100644 --- a/ios/RNAlooma.podspec +++ b/RNAlooma.podspec @@ -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 @@ -21,4 +21,4 @@ Pod::Spec.new do |s| end - \ No newline at end of file + diff --git a/android/build.gradle b/android/build.gradle index cadc13b..5d95c42 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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" } @@ -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' } diff --git a/android/src/main/java/com/countable/alooma/RNAloomaPackage.java b/android/src/main/java/com/countable/alooma/RNAloomaPackage.java index 073bef5..666b61e 100644 --- a/android/src/main/java/com/countable/alooma/RNAloomaPackage.java +++ b/android/src/main/java/com/countable/alooma/RNAloomaPackage.java @@ -15,7 +15,6 @@ public List createNativeModules(ReactApplicationContext reactConte return Arrays.asList(new RNAloomaModule(reactContext)); } - @Override public List> createJSModules() { return Collections.emptyList(); } diff --git a/ios/RNAlooma.m b/ios/RNAlooma.m index 4f270b2..7c769ab 100644 --- a/ios/RNAlooma.m +++ b/ios/RNAlooma.m @@ -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,