From 80c8aa6945a018ab35a51244a80a1465eb7d8cb2 Mon Sep 17 00:00:00 2001 From: khanhduytran0 <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 11 Apr 2020 15:05:51 +0700 Subject: [PATCH] Android Studio compatibility --- ...erCapture26Wrapper_jar_unspecified_jar.xml | 9 ++ ...ibs_asm_tree_5_0_3_jar_unspecified_jar.xml | 9 ++ ...libs_boardwalk_asm_jar_unspecified_jar.xml | 9 ++ ...s_boardwalk_jinput_jar_unspecified_jar.xml | 9 ++ ...bs_boardwalk_lwjgl_jar_unspecified_jar.xml | 9 ++ ...ibs_boardwalk_lzma_jar_unspecified_jar.xml | 9 ++ ...pp_libs_gson_2_8_6_jar_unspecified_jar.xml | 9 ++ ..._jopt_simple_5_0_4_jar_unspecified_jar.xml | 9 ++ ...le__android_arch_core_common_1_1_1_jar.xml | 11 ++ ...e__android_arch_core_runtime_1_1_1_aar.xml | 12 ++ ...ndroid_arch_lifecycle_common_1_1_1_jar.xml | 11 ++ ...roid_arch_lifecycle_livedata_1_1_1_aar.xml | 12 ++ ...arch_lifecycle_livedata_core_1_1_1_aar.xml | 12 ++ ...droid_arch_lifecycle_runtime_1_1_1_aar.xml | 12 ++ ...oid_arch_lifecycle_viewmodel_1_1_1_aar.xml | 12 ++ ...rt_animated_vector_drawable_24_0_0_aar.xml | 14 ++ ...rt_animated_vector_drawable_28_0_0_aar.xml | 10 ++ ...ndroid_support_appcompat_v7_24_0_0_aar.xml | 17 +++ ...ndroid_support_appcompat_v7_28_0_0_aar.xml | 13 ++ ...support_asynclayoutinflater_28_0_0_aar.xml | 10 ++ ...android_support_cardview_v7_28_0_0_aar.xml | 10 ++ ...android_support_collections_28_0_0_jar.xml | 9 ++ ...d_support_coordinatorlayout_28_0_0_aar.xml | 13 ++ ...droid_support_cursoradapter_28_0_0_aar.xml | 10 ++ ..._android_support_customview_28_0_0_aar.xml | 10 ++ ..._com_android_support_design_24_0_0_aar.xml | 17 +++ ..._com_android_support_design_28_0_0_aar.xml | 13 ++ ...ndroid_support_documentfile_28_0_0_aar.xml | 10 ++ ...ndroid_support_drawerlayout_28_0_0_aar.xml | 13 ++ ...ndroid_support_interpolator_28_0_0_aar.xml | 10 ++ ..._com_android_support_loader_28_0_0_aar.xml | 10 ++ ...pport_localbroadcastmanager_28_0_0_aar.xml | 10 ++ ...__com_android_support_print_28_0_0_aar.xml | 13 ++ ...oid_support_recyclerview_v7_24_0_0_aar.xml | 17 +++ ...oid_support_recyclerview_v7_28_0_0_aar.xml | 13 ++ ...d_support_slidingpanelayout_28_0_0_aar.xml | 10 ++ ...support_support_annotations_24_0_0_jar.xml | 13 ++ ...support_support_annotations_28_0_0_jar.xml | 9 ++ ...roid_support_support_compat_28_0_0_aar.xml | 13 ++ ...oid_support_support_core_ui_28_0_0_aar.xml | 10 ++ ..._support_support_core_utils_28_0_0_aar.xml | 10 ++ ...id_support_support_fragment_28_0_0_aar.xml | 13 ++ ...upport_support_media_compat_28_0_0_aar.xml | 13 ++ ..._android_support_support_v4_24_0_0_aar.xml | 18 +++ ..._android_support_support_v4_28_0_0_aar.xml | 10 ++ ...ort_support_vector_drawable_24_0_0_aar.xml | 14 ++ ...ort_support_vector_drawable_28_0_0_aar.xml | 10 ++ ..._support_swiperefreshlayout_28_0_0_aar.xml | 13 ++ ..._android_support_transition_28_0_0_aar.xml | 13 ++ ...support_versionedparcelable_28_0_0_aar.xml | 10 ++ ...m_android_support_viewpager_28_0_0_aar.xml | 10 ++ ...__com_wu_man_android_bsf_api_3_1_3_jar.xml | 13 ++ ...odec_commons_codec_20041127_091804_jar.xml | 9 ++ ...otation_javax_annotation_api_1_3_2_jar.xml | 13 ++ app/app.iml | 140 ++++++++++++++++++ app/build.gradle | 22 +-- .../internal/awt/AndroidGraphics2D.java | 2 +- .../com/kdt/mojangauth/RefreshTokenTask.java | 2 +- .../net/kdt/pojavlaunch/CancelException.java | 4 +- .../net/kdt/pojavlaunch/MainActivity.java | 30 ++-- .../injector/VanillaTweakInjector.java | 4 +- app/src/main/java/sun/misc/SharedSecrets.java | 16 +- build.gradle | 4 +- 63 files changed, 803 insertions(+), 41 deletions(-) create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_asm_tree_5_0_3_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_asm_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_jinput_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lwjgl_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lzma_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_gson_2_8_6_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_jopt_simple_5_0_4_jar_unspecified_jar.xml create mode 100644 .idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml create mode 100644 .idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml create mode 100644 .idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_appcompat_v7_24_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_design_24_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_recyclerview_v7_24_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_annotations_24_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_v4_24_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_vector_drawable_24_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_wu_man_android_bsf_api_3_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__commons_codec_commons_codec_20041127_091804_jar.xml create mode 100644 .idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml create mode 100644 app/app.iml diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml new file mode 100644 index 000000000..57451580f --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_asm_tree_5_0_3_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_asm_tree_5_0_3_jar_unspecified_jar.xml new file mode 100644 index 000000000..9d8b99ebd --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_asm_tree_5_0_3_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_asm_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_asm_jar_unspecified_jar.xml new file mode 100644 index 000000000..d5c0d23ca --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_asm_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_jinput_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_jinput_jar_unspecified_jar.xml new file mode 100644 index 000000000..05a95ebd2 --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_jinput_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lwjgl_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lwjgl_jar_unspecified_jar.xml new file mode 100644 index 000000000..a0ce4f3ae --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lwjgl_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lzma_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lzma_jar_unspecified_jar.xml new file mode 100644 index 000000000..50daa3bd1 --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_boardwalk_lzma_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_gson_2_8_6_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_gson_2_8_6_jar_unspecified_jar.xml new file mode 100644 index 000000000..be08abe1e --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_gson_2_8_6_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_jopt_simple_5_0_4_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_jopt_simple_5_0_4_jar_unspecified_jar.xml new file mode 100644 index 000000000..27240560a --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncherSource_app_libs_jopt_simple_5_0_4_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml new file mode 100644 index 000000000..bf16fff60 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml new file mode 100644 index 000000000..7ecb4245e --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml new file mode 100644 index 000000000..27b186756 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml new file mode 100644 index 000000000..13a141e2e --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml new file mode 100644 index 000000000..06d8ca65c --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml new file mode 100644 index 000000000..35812eb74 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml new file mode 100644 index 000000000..7ccbda588 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_0_0_aar.xml new file mode 100644 index 000000000..a18cfa4f3 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_0_0_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml new file mode 100644 index 000000000..0269fe89d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_0_0_aar.xml new file mode 100644 index 000000000..c36e4b6f3 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_0_0_aar.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml new file mode 100644 index 000000000..70ae794cb --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml new file mode 100644 index 000000000..c4cd5fa39 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml new file mode 100644 index 000000000..0e4f7a8f2 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml new file mode 100644 index 000000000..80e4d731e --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml new file mode 100644 index 000000000..a49ca9ca6 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml new file mode 100644 index 000000000..ae0d1d752 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml new file mode 100644 index 000000000..2111f7c90 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_design_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_24_0_0_aar.xml new file mode 100644 index 000000000..1aecfe0b0 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_design_24_0_0_aar.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml new file mode 100644 index 000000000..4809d79c9 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml new file mode 100644 index 000000000..b7b75b2ae --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml new file mode 100644 index 000000000..afb81a52f --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml new file mode 100644 index 000000000..a78326c3c --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml new file mode 100644 index 000000000..4a8fb0216 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml new file mode 100644 index 000000000..d94bec1af --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml new file mode 100644 index 000000000..43dfdef8c --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_0_0_aar.xml new file mode 100644 index 000000000..9f2feffdd --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_0_0_aar.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml new file mode 100644 index 000000000..2992858d2 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml new file mode 100644 index 000000000..1824b4740 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_24_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_24_0_0_jar.xml new file mode 100644 index 000000000..ea29d738a --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_annotations_24_0_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml new file mode 100644 index 000000000..0fdecce0d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml new file mode 100644 index 000000000..54d5cca90 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml new file mode 100644 index 000000000..9a16c4233 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml new file mode 100644 index 000000000..5f4b666c0 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml new file mode 100644 index 000000000..1b8e5f5e3 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml new file mode 100644 index 000000000..13d41bcad --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_24_0_0_aar.xml new file mode 100644 index 000000000..a3685888d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_v4_24_0_0_aar.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml new file mode 100644 index 000000000..79322129e --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_0_0_aar.xml new file mode 100644 index 000000000..68f937201 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_0_0_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml new file mode 100644 index 000000000..6a4de6aee --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml new file mode 100644 index 000000000..86a3e4095 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml new file mode 100644 index 000000000..8bbee1f7c --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml new file mode 100644 index 000000000..adc965bc5 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml new file mode 100644 index 000000000..81881add7 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_wu_man_android_bsf_api_3_1_3_jar.xml b/.idea/libraries/Gradle__com_wu_man_android_bsf_api_3_1_3_jar.xml new file mode 100644 index 000000000..f6c3e3206 --- /dev/null +++ b/.idea/libraries/Gradle__com_wu_man_android_bsf_api_3_1_3_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_codec_commons_codec_20041127_091804_jar.xml b/.idea/libraries/Gradle__commons_codec_commons_codec_20041127_091804_jar.xml new file mode 100644 index 000000000..4094ab46f --- /dev/null +++ b/.idea/libraries/Gradle__commons_codec_commons_codec_20041127_091804_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml new file mode 100644 index 000000000..7c5147fcf --- /dev/null +++ b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 000000000..0da2b389a --- /dev/null +++ b/app/app.iml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 86350562c..cdb242c30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "21.1.0" + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "net.kdt.pojavlaunch" @@ -17,6 +17,8 @@ android { // Don't set to true or java.awt will be a.a or something similar. minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + multiDexEnabled = true + debuggable = true } } @@ -28,14 +30,14 @@ android { } dependencies { - compile 'javax.annotation:javax.annotation-api:1.3.2' - compile 'commons-codec:commons-codec:1.14' - compile 'com.wu-man:android-bsf-api:3.1.3' - compile 'com.android.support:support-v4:24.0.0' - compile 'com.android.support:appcompat-v7:24.0.0' - compile 'com.android.support:design:24.0.0' - compile 'com.android.support:support-annotations:24.0.0' + implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation 'commons-codec:commons-codec:20041127.091804' + implementation 'com.wu-man:android-bsf-api:3.1.3' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:support-annotations:28.0.0' // compile 'com.google.guava:guava:24.0-android' - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/app/src/main/java/com/android/internal/awt/AndroidGraphics2D.java b/app/src/main/java/com/android/internal/awt/AndroidGraphics2D.java index 78f8e42e5..40c2b8494 100644 --- a/app/src/main/java/com/android/internal/awt/AndroidGraphics2D.java +++ b/app/src/main/java/com/android/internal/awt/AndroidGraphics2D.java @@ -1073,7 +1073,7 @@ public class AndroidGraphics2D extends Graphics2D { mP = new Paint(); } Paint.Style tmp = mP.getStyle(); - mC.save(Canvas.CLIP_SAVE_FLAG); + mC.save(); // (CLIP_SAVE_FLAG); mP.setStyle(Paint.Style.FILL); diff --git a/app/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java b/app/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java index c1b31063e..ec9499dac 100644 --- a/app/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java +++ b/app/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java @@ -16,7 +16,7 @@ public class RefreshTokenTask extends AsyncTask { private Context ctx; private ProgressDialog build; - @Override + public RefreshTokenTask(Context ctx, RefreshListener listener) { this.ctx = ctx; this.listener = listener; diff --git a/app/src/main/java/net/kdt/pojavlaunch/CancelException.java b/app/src/main/java/net/kdt/pojavlaunch/CancelException.java index 4a5da1546..263770145 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/CancelException.java +++ b/app/src/main/java/net/kdt/pojavlaunch/CancelException.java @@ -2,13 +2,11 @@ package net.kdt.pojavlaunch; public class CancelException extends RuntimeException { - @Override public CancelException() { super(); // org.lwjgl.c } - - @Override + public CancelException(String msg) { super(msg); } diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index d6201b886..a28db29c9 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -421,8 +421,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, } } else { switch (e.getActionMasked()) { - case e.ACTION_DOWN: // 0 - case e.ACTION_POINTER_DOWN: // 5 + case MotionEvent.ACTION_DOWN: // 0 + case MotionEvent.ACTION_POINTER_DOWN: // 5 isTouchInHotbar = hudKeyHandled != -1; if (isTouchInHotbar) { sendKeyPress(hudKeyHandled, true); @@ -444,9 +444,9 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, } } break; - case e.ACTION_UP: // 1 - case e.ACTION_CANCEL: // 3 - case e.ACTION_POINTER_UP: // 6 + case MotionEvent.ACTION_UP: // 1 + case MotionEvent.ACTION_CANCEL: // 3 + case MotionEvent.ACTION_POINTER_UP: // 6 if (!isTouchInHotbar) { AndroidDisplay.mouseX = x; AndroidDisplay.mouseY = y; @@ -543,17 +543,17 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, } switch (e.getActionMasked()) { - case e.ACTION_DOWN: // 0 - case e.ACTION_POINTER_DOWN: // 5 + case MotionEvent.ACTION_DOWN: // 0 + case MotionEvent.ACTION_POINTER_DOWN: // 5 AndroidDisplay.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 1, x, y, 0, System.nanoTime()); initialX = x; initialY = y; theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, 500); break; - case e.ACTION_UP: // 1 - case e.ACTION_CANCEL: // 3 - case e.ACTION_POINTER_UP: // 6 + case MotionEvent.ACTION_UP: // 1 + case MotionEvent.ACTION_CANCEL: // 3 + case MotionEvent.ACTION_POINTER_UP: // 6 AndroidDisplay.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 0, x, y, 0, System.nanoTime()); /* if (!triggeredLeftMouseButton && Math.abs(initialX - x) < fingerStillThreshold && Math.abs(initialY - y) < fingerStillThreshold) { @@ -740,13 +740,13 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, public boolean onTouch(View v, MotionEvent e) { boolean isDown; switch (e.getActionMasked()) { - case TessState.T_DORMANT /*0*/: - case AppletLoader.STATE_CHECKING_FOR_UPDATES /*5*/: + case MotionEvent.ACTION_DOWN: // 0 + case MotionEvent.ACTION_POINTER_DOWN: // 5 isDown = true; break; - case TessState.T_IN_POLYGON /*1*/: - case AppletLoader.STATE_DETERMINING_PACKAGES /*3*/: - case AppletLoader.STATE_DOWNLOADING /*6*/: + case MotionEvent.ACTION_UP: // 1 + case MotionEvent.ACTION_CANCEL: // 3 + case MotionEvent.ACTION_POINTER_UP: // 6 isDown = false; break; default: diff --git a/app/src/main/java/net/minecraft/launchwrapper/injector/VanillaTweakInjector.java b/app/src/main/java/net/minecraft/launchwrapper/injector/VanillaTweakInjector.java index c0236ee39..edb554a0f 100644 --- a/app/src/main/java/net/minecraft/launchwrapper/injector/VanillaTweakInjector.java +++ b/app/src/main/java/net/minecraft/launchwrapper/injector/VanillaTweakInjector.java @@ -33,7 +33,7 @@ public class VanillaTweakInjector implements IClassTransformer { ClassNode classNode = new ClassNode(); new ClassReader(bytes).accept(classNode, 8); MethodNode mainMethod = null; - for (MethodNode methodNode : classNode.methods) { + for (MethodNode methodNode : (List) classNode.methods) { if ("main".equals(methodNode.name)) { mainMethod = methodNode; break; @@ -43,7 +43,7 @@ public class VanillaTweakInjector implements IClassTransformer { return bytes; } FieldNode workDirNode = null; - for (FieldNode fieldNode : classNode.fields) { + for (FieldNode fieldNode : (List) classNode.fields) { if (Type.getDescriptor(File.class).equals(fieldNode.desc) && (fieldNode.access & 8) == 8) { workDirNode = fieldNode; break; diff --git a/app/src/main/java/sun/misc/SharedSecrets.java b/app/src/main/java/sun/misc/SharedSecrets.java index 6209e92ef..c3288d2bf 100644 --- a/app/src/main/java/sun/misc/SharedSecrets.java +++ b/app/src/main/java/sun/misc/SharedSecrets.java @@ -44,7 +44,7 @@ import java.security.AccessController; for this purpose, namely the loss of compile-time checking. */ public class SharedSecrets { - private static final FakeUnsafe FakeUnsafe = FakeUnsafe.getUnsafe(); + private static final FakeUnsafe fakeUnsafe = sun.misc.FakeUnsafe.getUnsafe(); private static JavaUtilJarAccess javaUtilJarAccess; //private static JavaLangAccess javaLangAccess; private static JavaIOAccess javaIOAccess; @@ -61,7 +61,7 @@ public class SharedSecrets { if (javaUtilJarAccess == null) { // Ensure JarFile is initialized; we know that that class // provides the shared secret - FakeUnsafe.ensureClassInitialized(JarFile.class); + fakeUnsafe.ensureClassInitialized(JarFile.class); } return javaUtilJarAccess; } @@ -92,7 +92,7 @@ public class SharedSecrets { public static JavaNetHttpCookieAccess getJavaNetHttpCookieAccess() { if (javaNetHttpCookieAccess == null) - FakeUnsafe.ensureClassInitialized(java.net.HttpCookie.class); + fakeUnsafe.ensureClassInitialized(java.net.HttpCookie.class); return javaNetHttpCookieAccess; } @@ -105,7 +105,7 @@ public class SharedSecrets { // Ensure java.nio.ByteOrder is initialized; we know that // this class initializes java.nio.Bits that provides the // shared secret. - FakeUnsafe.ensureClassInitialized(java.nio.ByteOrder.class); + fakeUnsafe.ensureClassInitialized(java.nio.ByteOrder.class); } return javaNioAccess; } @@ -116,7 +116,7 @@ public class SharedSecrets { public static JavaIOAccess getJavaIOAccess() { if (javaIOAccess == null) { - FakeUnsafe.ensureClassInitialized(Console.class); + fakeUnsafe.ensureClassInitialized(Console.class); } return javaIOAccess; } @@ -127,7 +127,7 @@ public class SharedSecrets { public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() { if (javaIOFileDescriptorAccess == null) - FakeUnsafe.ensureClassInitialized(FileDescriptor.class); + fakeUnsafe.ensureClassInitialized(FileDescriptor.class); return javaIOFileDescriptorAccess; } @@ -140,7 +140,7 @@ public class SharedSecrets { public static JavaSecurityProtectionDomainAccess getJavaSecurityProtectionDomainAccess() { if (javaSecurityProtectionDomainAccess == null) - FakeUnsafe.ensureClassInitialized(ProtectionDomain.class); + fakeUnsafe.ensureClassInitialized(ProtectionDomain.class); return javaSecurityProtectionDomainAccess; } /* @@ -173,7 +173,7 @@ public class SharedSecrets { public static JavaUtilZipAccess getJavaUtilZipAccess() { if (javaUtilZipAccess == null) { - FakeUnsafe.ensureClassInitialized(Adler32.class); + fakeUnsafe.ensureClassInitialized(Adler32.class); } return javaUtilZipAccess; } diff --git a/build.gradle b/build.gradle index 40db0419e..b64acc417 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.5.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,5 +16,6 @@ buildscript { allprojects { repositories { jcenter() + google() } }