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
d0ced7a4
Commit
d0ced7a4
authored
Apr 16, 2020
by
thebestnom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Android: Migrate deprecated support library to AndroidX
parent
6a0473bc
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
18 deletions
+25
-18
config.gradle
platform/android/java/app/config.gradle
+4
-4
gradle.properties
platform/android/java/gradle.properties
+3
-0
DownloadNotification.java
...nding/expansion/downloader/impl/DownloadNotification.java
+2
-2
Godot.java
...orm/android/java/lib/src/org/godotengine/godot/Godot.java
+5
-4
GodotPlugin.java
...ava/lib/src/org/godotengine/godot/plugin/GodotPlugin.java
+3
-3
GodotPluginRegistry.java
...src/org/godotengine/godot/plugin/GodotPluginRegistry.java
+2
-2
SignalInfo.java
...java/lib/src/org/godotengine/godot/plugin/SignalInfo.java
+2
-1
PermissionsUtil.java
.../lib/src/org/godotengine/godot/utils/PermissionsUtil.java
+2
-1
GodotPayment.java
...va/org/godotengine/godot/plugin/payment/GodotPayment.java
+2
-1
No files found.
platform/android/java/app/config.gradle
View file @
d0ced7a4
...
...
@@ -4,18 +4,18 @@ ext.versions = [
minSdk
:
18
,
targetSdk
:
29
,
buildTools
:
'29.0.3'
,
supportCoreUtils
:
'
28
.0.0'
,
supportCoreUtils
:
'
1
.0.0'
,
kotlinVersion
:
'1.3.61'
,
v4Support
:
'
28
.0.0'
v4Support
:
'
1
.0.0'
]
ext
.
libraries
=
[
androidGradlePlugin:
"com.android.tools.build:gradle:$versions.androidGradlePlugin"
,
supportCoreUtils
:
"
com.android.support:
support-core-utils:$versions.supportCoreUtils"
,
supportCoreUtils
:
"
androidx.legacy:legacy-
support-core-utils:$versions.supportCoreUtils"
,
kotlinGradlePlugin
:
"org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlinVersion"
,
kotlinStdLib
:
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlinVersion"
,
v4Support
:
"
com.android.support:
support-v4:$versions.v4Support"
v4Support
:
"
androidx.legacy:legacy-
support-v4:$versions.v4Support"
]
ext
.
getExportPackageName
=
{
->
...
...
platform/android/java/gradle.properties
View file @
d0ced7a4
...
...
@@ -7,6 +7,9 @@
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
android.enableJetifier
=
true
android.useAndroidX
=
true
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs
=
-Xmx1536m
...
...
platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
View file @
d0ced7a4
...
...
@@ -29,9 +29,9 @@ import com.google.android.vending.expansion.downloader.IDownloaderClient;
import
android.app.NotificationManager
;
import
android.app.PendingIntent
;
import
android.content.Context
;
import
android.os.Build
;
import
android.os.Messenger
;
import
android.support.v4.app.NotificationCompat
;
import
androidx.core.app.NotificationCompat
;
/**
* This class handles displaying the notification associated with the download
...
...
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View file @
d0ced7a4
...
...
@@ -66,10 +66,6 @@ import android.os.Messenger;
import
android.os.VibrationEffect
;
import
android.os.Vibrator
;
import
android.provider.Settings.Secure
;
import
android.support.annotation.CallSuper
;
import
android.support.annotation.Keep
;
import
android.support.annotation.NonNull
;
import
android.support.v4.app.FragmentActivity
;
import
android.view.Display
;
import
android.view.KeyEvent
;
import
android.view.MotionEvent
;
...
...
@@ -85,6 +81,11 @@ import android.widget.FrameLayout;
import
android.widget.ProgressBar
;
import
android.widget.TextView
;
import
androidx.annotation.CallSuper
;
import
androidx.annotation.Keep
;
import
androidx.annotation.NonNull
;
import
androidx.fragment.app.FragmentActivity
;
import
com.google.android.vending.expansion.downloader.DownloadProgressInfo
;
import
com.google.android.vending.expansion.downloader.DownloaderClientMarshaller
;
import
com.google.android.vending.expansion.downloader.DownloaderServiceMarshaller
;
...
...
platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java
View file @
d0ced7a4
...
...
@@ -35,13 +35,13 @@ import org.godotengine.godot.Godot;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.view.Surface
;
import
android.view.View
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
java.lang.reflect.Method
;
import
java.util.ArrayList
;
import
java.util.Collections
;
...
...
platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java
View file @
d0ced7a4
...
...
@@ -35,13 +35,13 @@ import org.godotengine.godot.Godot;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
androidx.annotation.Nullable
;
import
java.lang.reflect.Constructor
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.HashSet
;
import
java.util.Set
;
...
...
platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java
View file @
d0ced7a4
...
...
@@ -30,9 +30,10 @@
package
org
.
godotengine
.
godot
.
plugin
;
import
android.support.annotation.NonNull
;
import
android.text.TextUtils
;
import
androidx.annotation.NonNull
;
import
java.util.Arrays
;
/**
...
...
platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java
View file @
d0ced7a4
...
...
@@ -37,9 +37,10 @@ import android.content.pm.PackageInfo;
import
android.content.pm.PackageManager
;
import
android.content.pm.PermissionInfo
;
import
android.os.Build
;
import
android.support.v4.content.ContextCompat
;
import
android.util.Log
;
import
androidx.core.content.ContextCompat
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
platform/android/java/plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/payment/GodotPayment.java
View file @
d0ced7a4
...
...
@@ -36,9 +36,10 @@ import org.godotengine.godot.GodotLib;
import
org.godotengine.godot.plugin.GodotPlugin
;
import
android.content.Intent
;
import
android.support.annotation.NonNull
;
import
android.util.Log
;
import
androidx.annotation.NonNull
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
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