react-native-webview-bootpay 11.26.20 → 13.6.1

package/README.md

@@ -64,38 +64,15 @@ yarn add react-native-webview-bootpay
 
 ## 사용예제
 
-```dart 
-import React, {Component} from 'react';
-import {
-  StyleSheet,
-  SafeAreaView,
-  Linking
-} from 'react-native';
-
-import WebView from 'react-native-webview-bootpay';
-
-export default class App extends Component {
-  render() {
-    return (
-      <SafeAreaView style={styles.container}>
-        <WebView
-          source={{uri: "https://www.yourdomain.com"}}
-          automaticallyAdjustContentInsets={false}
-         
-        />
-      </SafeAreaView>
-    );
-  }
+```tsx
+import React, { Component } from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+import { WebView } from 'react-native-webview-bootpay';
+
+// ...
+const MyWebComponent = () => {
+  return <WebView source={{ uri: 'https://reactnative.dev/' }} style={{ flex: 1 }} />;
 }
-  
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#F5FCFF',
-    padding: 8,
-  }
-});
-
 ```
 
 ## onMessage 사용시
@@ -118,3 +95,4 @@ window.BootpayRNWebView.postMessage("test data"); //부트페이 웹뷰
 
 
 
+

package/android/build.gradle

@@ -1,137 +1,95 @@
-buildscript {
-  ext.getExtOrDefault = {name ->
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['BootpayRNWebView_' + name]
-  }
+import java.nio.file.Paths
 
-  // The Android Gradle plugin is only required when opening the android folder stand-alone.
-  // This avoids unnecessary downloads and potential conflicts when the library is included as a
-  // module dependency in an application project.
-  if (project == rootProject) {
-    repositories {
-      mavenCentral()
-      google()
-    }
-
-    dependencies {
-      classpath("com.android.tools.build:gradle:3.6.0")
-      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}")
+buildscript {
+    ext.safeExtGet = {prop ->
+        rootProject.ext.has(prop) ? rootProject.ext.get(prop) : project.properties['ReactNativeWebView_' + prop]
     }
-  } else {
     repositories {
-      mavenCentral()
+        google()
+        gradlePluginPortal()
     }
-
     dependencies {
-      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion')}")
+        classpath("com.android.tools.build:gradle:7.0.4")
     }
-  }
 }
 
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['BootpayRNWebView_' + name]).toInteger()
+def getExtOrIntegerDefault(prop) {
+  return rootProject.ext.has(prop) ? rootProject.ext.get(prop) : (project.properties['ReactNativeWebView_' + prop]).toInteger()
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  defaultConfig {
-    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 1
-    versionName "1.0"
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
+static def findNodeModulePath(baseDir, packageName) {
+    def basePath = baseDir.toPath().normalize()
+    // Node's module resolution algorithm searches up to the root directory,
+    // after which the base path will be null
+    while (basePath) {
+        def candidatePath = Paths.get(basePath.toString(), "node_modules", packageName)
+        if (candidatePath.toFile().exists()) {
+            return candidatePath.toString()
+        }
+        basePath = basePath.getParent()
     }
-  }
-  lintOptions {
-    disable 'GradleCompatible'
-  }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
+    return null
 }
 
-repositories {
-  mavenCentral()
-  google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-      projectDir,
-      '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
-    }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
 
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
 
-      def androidSourcesDir = new File(
-        parentDir,
-        'node_modules/react-native'
-      )
+apply plugin: 'com.android.library'
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
+apply plugin: 'kotlin-android'
 
-      def androidPrebuiltBinaryDir = new File(
-        parentDir,
-        'node_modules/react-native/android'
-      )
+android {
+    compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
 
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
+    defaultConfig {
+        minSdkVersion getExtOrIntegerDefault('minSdkVersion')
+        targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    }
 
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch']
+            } else {
+                java.srcDirs += ['src/oldarch']
+            }
         }
+    }
+}
 
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-      "${project.name}: unable to locate React Native android sources. " +
-        "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
+def reactNativePath = findNodeModulePath(projectDir, "react-native")
+def codegenPath = findNodeModulePath(projectDir, "@react-native/codegen")
+if (codegenPath == null) {
+  // Compat for 0.71 and lower (to be removed)
+  codegenPath = findNodeModulePath(projectDir, "react-native-codegen")
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
-def webkit_version = getExtOrDefault('webkitVersion')
+repositories {
+    maven {
+        url "${reactNativePath}/android"
+    }
+    mavenCentral()
+    google()
+}
 
 dependencies {
-  //noinspection GradleDynamicVersion
-  implementation 'com.facebook.react:react-native:+'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "androidx.webkit:webkit:$webkit_version"
+    implementation 'com.facebook.react:react-native:+'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion')}"
+    implementation "androidx.webkit:webkit:${safeExtGet('webkitVersion')}"
+}
+
+if (isNewArchitectureEnabled()) {
+    react {
+        jsRootDir = file("../src/")
+        libraryName = "BPCWebView"
+        codegenJavaPackageName = "kr.co.bootpay.webview"
+        codegenDir = new File(codegenPath)
+        reactNativeDir = new File(reactNativePath)
+    }
 }

package/android/gradle.properties

@@ -1,6 +1,5 @@
-BootpayRNWebView_kotlinVersion=1.6.0
-BootpayRNWebView_webkitVersion=1.4.0
-BootpayRNWebView_compileSdkVersion=29
-BootpayRNWebView_buildToolsVersion=29.0.3
-BootpayRNWebView_targetSdkVersion=28
-BootpayRNWebView_minSdkVersion=21
+ReactNativeWebView_kotlinVersion=1.6.0
+ReactNativeWebView_webkitVersion=1.4.0
+ReactNativeWebView_compileSdkVersion=31
+ReactNativeWebView_targetSdkVersion=31
+ReactNativeWebView_minSdkVersion=21

package/android/src/main/java/kr/co/bootpay/webview/BPCBasicAuthCredential.java

@@ -0,0 +1,11 @@
+package kr.co.bootpay.webview;
+
+class BPCBasicAuthCredential {
+    String username;
+    String password;
+
+    BPCBasicAuthCredential(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+}