Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
c591cb8f
Commit
c591cb8f
authored
Apr 15, 2020
by
fhuya
Committed by
Fredia Huya-Kouadio
Apr 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate legacy apache dependency to the GodotPayment plugin
This is the only location in the codebase where it's being used, so no need to make the main lib have a dependency on it.
parent
3c1218a3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
7 deletions
+8
-7
build.gradle
platform/android/java/lib/build.gradle
+0
-1
build.gradle
platform/android/java/plugins/godotpayment/build.gradle
+1
-0
ValidateTask.java
...va/org/godotengine/godot/plugin/payment/ValidateTask.java
+2
-2
CustomSSLSocketFactory.java
...ne/godot/plugin/payment/utils/CustomSSLSocketFactory.java
+2
-1
HttpRequester.java
...godotengine/godot/plugin/payment/utils/HttpRequester.java
+2
-1
RequestParams.java
...godotengine/godot/plugin/payment/utils/RequestParams.java
+1
-2
No files found.
platform/android/java/lib/build.gradle
View file @
c591cb8f
...
@@ -12,7 +12,6 @@ def pathToRootDir = "../../../../"
...
@@ -12,7 +12,6 @@ def pathToRootDir = "../../../../"
android
{
android
{
compileSdkVersion
versions
.
compileSdk
compileSdkVersion
versions
.
compileSdk
buildToolsVersion
versions
.
buildTools
buildToolsVersion
versions
.
buildTools
useLibrary
'org.apache.http.legacy'
defaultConfig
{
defaultConfig
{
minSdkVersion
versions
.
minSdk
minSdkVersion
versions
.
minSdk
...
...
platform/android/java/plugins/godotpayment/build.gradle
View file @
c591cb8f
...
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
...
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
android
{
android
{
compileSdkVersion
versions
.
compileSdk
compileSdkVersion
versions
.
compileSdk
buildToolsVersion
versions
.
buildTools
buildToolsVersion
versions
.
buildTools
useLibrary
'org.apache.http.legacy'
defaultConfig
{
defaultConfig
{
minSdkVersion
versions
.
minSdk
minSdkVersion
versions
.
minSdk
...
...
platform/android/java/plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/payment/ValidateTask.java
View file @
c591cb8f
...
@@ -34,8 +34,8 @@ import android.app.Activity;
...
@@ -34,8 +34,8 @@ import android.app.Activity;
import
android.app.ProgressDialog
;
import
android.app.ProgressDialog
;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
java.lang.ref.WeakReference
;
import
java.lang.ref.WeakReference
;
import
org.godotengine.godot.utils.HttpRequester
;
import
org.godotengine.godot.
plugin.payment.
utils.HttpRequester
;
import
org.godotengine.godot.utils.RequestParams
;
import
org.godotengine.godot.
plugin.payment.
utils.RequestParams
;
import
org.json.JSONException
;
import
org.json.JSONException
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
...
...
platform/android/java/
lib/src/org/godotengine/godo
t/utils/CustomSSLSocketFactory.java
→
platform/android/java/
plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/paymen
t/utils/CustomSSLSocketFactory.java
View file @
c591cb8f
...
@@ -28,7 +28,8 @@
...
@@ -28,7 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
/*************************************************************************/
package
org
.
godotengine
.
godot
.
utils
;
package
org
.
godotengine
.
godot
.
plugin
.
payment
.
utils
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.net.Socket
;
import
java.net.Socket
;
import
java.net.UnknownHostException
;
import
java.net.UnknownHostException
;
...
...
platform/android/java/
lib/src/org/godotengine/godo
t/utils/HttpRequester.java
→
platform/android/java/
plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/paymen
t/utils/HttpRequester.java
View file @
c591cb8f
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
/*************************************************************************/
package
org
.
godotengine
.
godot
.
utils
;
package
org
.
godotengine
.
godot
.
plugin
.
payment
.
utils
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
...
@@ -61,6 +61,7 @@ import org.apache.http.params.HttpParams;
...
@@ -61,6 +61,7 @@ import org.apache.http.params.HttpParams;
import
org.apache.http.params.HttpProtocolParams
;
import
org.apache.http.params.HttpProtocolParams
;
import
org.apache.http.protocol.HTTP
;
import
org.apache.http.protocol.HTTP
;
import
org.apache.http.util.EntityUtils
;
import
org.apache.http.util.EntityUtils
;
import
org.godotengine.godot.utils.Crypt
;
/**
/**
*
*
...
...
platform/android/java/
lib/src/org/godotengine/godo
t/utils/RequestParams.java
→
platform/android/java/
plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/paymen
t/utils/RequestParams.java
View file @
c591cb8f
...
@@ -28,10 +28,9 @@
...
@@ -28,10 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
/*************************************************************************/
package
org
.
godotengine
.
godot
.
utils
;
package
org
.
godotengine
.
godot
.
plugin
.
payment
.
utils
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.http.NameValuePair
;
import
org.apache.http.NameValuePair
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment