Skip to content

Commit 104cc0c

Browse files
committed
Pull Request Release
1 parent ba60401 commit 104cc0c

18 files changed

Lines changed: 431 additions & 263 deletions

.DS_Store

6 KB
Binary file not shown.

plugins/.DS_Store

6 KB
Binary file not shown.

plugins/2013.2090/.DS_Store

6 KB
Binary file not shown.
-1.17 KB
Binary file not shown.

src/.DS_Store

6 KB
Binary file not shown.

src/android/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
**/.idea/**
44
.DS_Store
55
**/build/**
6+
preloadedAssets/build/
7+
preloadedAssets/src/

src/android/app/build.gradle.kts

Lines changed: 126 additions & 62 deletions
Large diffs are not rendered by default.

src/android/app/proguard-rules.pro

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
22+
-keep class com.ansca.** { *; }
23+
-keep class com.coronalabs.** { *; }
24+
-keep class com.naef.** { *; }
25+
-keep class **.LuaLoader.** { *; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">Corona App</string>
3+
<string name="app_name">Solar2D App</string>
44
</resources>

src/android/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@ buildscript {
22
repositories {
33
google()
44
jcenter()
5+
mavenCentral()
56
}
67
dependencies {
7-
classpath(kotlin("gradle-plugin", version = "1.3.70"))
8-
classpath("com.android.tools.build:gradle:3.5.4")
9-
classpath("com.beust:klaxon:5.0.1")
8+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
9+
classpath("com.android.tools.build:gradle:8.5.1")
10+
classpath("com.beust:klaxon:5.5")
1011
}
1112
}
1213

1314
allprojects {
1415
repositories {
1516
google()
1617
jcenter()
18+
mavenCentral()
1719
// maven(url = "https:// some custom repo")
18-
val nativeDir = if (System.getProperty("os.name").toLowerCase().contains("windows")) {
20+
val nativeDir = if (System.getProperty("os.name").lowercase().contains("windows")) {
1921
System.getenv("CORONA_ROOT")
2022
} else {
2123
"${System.getenv("HOME")}/Library/Application Support/Corona/Native/"
@@ -27,5 +29,5 @@ allprojects {
2729
}
2830

2931
tasks.register<Delete>("clean") {
30-
delete(rootProject.buildDir)
32+
delete(rootProject.layout.buildDirectory.asFile.get())
3133
}

0 commit comments

Comments
 (0)