Skip to content

Commit 05bfdf8

Browse files
committed
Migrated to Kotlin
1 parent 998964b commit 05bfdf8

File tree

284 files changed

+6909
-13727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+6909
-13727
lines changed

.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
/.idea
1+
*.iml
2+
.gradle
3+
/.idea/caches
4+
/.idea/libraries
5+
/.idea/modules.xml
6+
/.idea/workspace.xml
7+
/.idea/navEditor.xml
8+
/.idea/assetWizardSettings.xml
9+
.DS_Store
210
/build
311
/captures
4-
/gradle
12+
.externalNativeBuild

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
[![License Info](https://img.shields.io/badge/license-GNU_GPLv3-blue.svg?style=flat-square)](https://github.com/TimScriptov/ModdedPE) [![Play Store Info](https://img.shields.io/badge/Play_Store-v1.13.0.1-blue.svg?style=flat-square)](https://play.google.com/store/apps/details?id=com.mcal.mcpelauncher) [![Latest Release](https://img.shields.io/github/release/TimScriptov/ModdedPE.svg)](../../releases) [![All Releases Download](https://img.shields.io/github/downloads/TimScriptov/ModdedPE/total.svg)](../../releases)
2-
3-
1+
[![License Info](https://img.shields.io/badge/license-GNU_GPLv3-blue.svg?style=flat-square)](https://github.com/TimScriptov/ModdedPE) [![Play Store Info](https://img.shields.io/badge/Play_Store-v1.13.0.1-blue.svg?style=flat-square)](https://play.google.com/store/apps/details?id=com.mcal.mcpelauncher)
42
# ModdedPE!
53
![logo][1]
64
--------

app/build.gradle

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-android-extensions'
24

35
android {
46
compileSdkVersion 29
5-
buildToolsVersion "29.0.0"
7+
buildToolsVersion "29.0.2"
8+
69
defaultConfig {
710
applicationId "com.mcal.mcpelauncher"
8-
minSdkVersion 16
11+
minSdkVersion 21
912
targetSdkVersion 29
10-
versionCode 871130004
11-
versionName "1.13.0.4"
12-
ndk {
13-
abiFilters 'armeabi-v7a', 'x86'//, 'arm64-v8a', 'x86_64'
14-
}
13+
versionCode 871130002
14+
versionName "1.13.0.1"
15+
//ndk {
16+
// abiFilters 'armeabi-v7a', 'x86'//, 'arm64-v8a', 'x86_64'
17+
//}
1518
}
1619

17-
externalNativeBuild {
18-
ndkBuild {
19-
path 'src/main/jni/Android.mk'
20-
}
21-
}
20+
// externalNativeBuild {
21+
// ndkBuild {
22+
// path 'src/main/jni/Android.mk'
23+
// }
24+
// }
2225

2326
buildTypes {
2427
release {
@@ -34,19 +37,28 @@ android {
3437
// but continue the build even when errors are found:
3538
abortOnError false
3639
}
40+
compileOptions {
41+
sourceCompatibility = '1.8'
42+
targetCompatibility = '1.8'
43+
}
3744
}
3845

3946
dependencies {
4047
implementation fileTree(dir: 'libs', include: ['*.jar'])
41-
implementation 'androidx.appcompat:appcompat:1.0.0'
48+
implementation 'androidx.appcompat:appcompat:1.1.0'
4249
implementation 'androidx.cardview:cardview:1.0.0'
4350
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
4451
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
45-
implementation 'com.android.support:support-v4:25.0.0'
46-
implementation 'androidx.preference:preference:1.0.0'
47-
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
48-
implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
52+
implementation 'androidx.preference:preference:1.1.0'
53+
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
54+
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
4955
implementation 'com.google.android.material:material:1.0.0'
5056
implementation 'org.zeroturnaround:zt-zip:1.13'
51-
implementation 'com.anjlab.android.iab.v3:library:1.0.44'
57+
implementation 'com.anjlab.android.iab.v3:library:1.1.0'
58+
implementation "androidx.core:core-ktx:1.2.0-alpha04"
59+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0"
60+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"//1.3.41
61+
}
62+
repositories {
63+
mavenCentral()
5264
}

app/libs/minecraft.jar

-643 KB
Binary file not shown.

app/proguard-rules.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
-dontwarn
77
-dontnote
88

9-
#-dontobfuscate
9+
-dontobfuscate
1010

1111
#-obfuscationdictionary proguard-dictionary.txt
1212
#-packageobfuscationdictionary proguard-dictionary.txt
1313
#-classobfuscationdictionary proguard-dictionary.txt
1414

15-
-keep class com.mcal.** { *; }
15+
-keep class com.mcal.pesdk.nativeapi.** { *; }
1616

1717
-keep class org.slf4j.LoggerFactory
1818

app/src/main/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)