godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

(cherry picked from commit c591cb8fda)
This commit is contained in:
fhuya 2020-04-15 22:32:46 -07:00 committed by Rémi Verschelde
parent 88e1264893
commit 373db27788
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/android/java/lib/build.gradle
View File

@ -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

1
platform/android/java/plugins/godotpayment/build.gradle
View File

@ -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

4
platform/android/java/plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/payment/ValidateTask.java
View File

@ -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;

3
platform/android/java/lib/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java → platform/android/java/plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/payment/utils/CustomSSLSocketFactory.java
View File

@ -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;

3
platform/android/java/lib/src/org/godotengine/godot/utils/HttpRequester.java → platform/android/java/plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/payment/utils/HttpRequester.java
View File

@ -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;
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;
/** /**
* *

3
platform/android/java/lib/src/org/godotengine/godot/utils/RequestParams.java → platform/android/java/plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/payment/utils/RequestParams.java
View File

@ -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;