mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-11 08:15:35 +03:00
Updated Gradle + other deps
This commit is contained in:
parent
8311261e3c
commit
73dd487af9
@ -7,7 +7,7 @@ buildscript{
|
||||
}
|
||||
|
||||
dependencies{
|
||||
classpath 'com.android.tools.build:gradle:7.2.1'
|
||||
classpath 'com.android.tools.build:gradle:8.1.0'
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,8 +29,10 @@ task deploy(type: Copy){
|
||||
}
|
||||
|
||||
android{
|
||||
namespace "io.anuke.mindustry"
|
||||
buildToolsVersion '33.0.2'
|
||||
compileSdkVersion 33
|
||||
|
||||
sourceSets{
|
||||
main{
|
||||
manifest.srcFile 'AndroidManifest.xml'
|
||||
|
6
android/proguard-rules.pro
vendored
6
android/proguard-rules.pro
vendored
@ -8,4 +8,8 @@
|
||||
-keep class rhino.** { *; }
|
||||
-keep class com.android.dex.** { *; }
|
||||
|
||||
#-printusage out.txt
|
||||
-dontwarn javax.naming.NamingException
|
||||
-dontwarn javax.naming.directory.DirContext
|
||||
-dontwarn javax.naming.directory.InitialDirContext
|
||||
|
||||
#-printusage out.txt
|
||||
|
@ -22,8 +22,8 @@ buildscript{
|
||||
}
|
||||
|
||||
plugins{
|
||||
id "org.jetbrains.kotlin.jvm" version "1.6.0"
|
||||
id "org.jetbrains.kotlin.kapt" version "1.6.0"
|
||||
id "org.jetbrains.kotlin.jvm" version "1.8.20"
|
||||
id "org.jetbrains.kotlin.kapt" version "1.8.20"
|
||||
}
|
||||
|
||||
allprojects{
|
||||
@ -365,7 +365,6 @@ project(":core"){
|
||||
//these are completely unnecessary
|
||||
tasks.kaptGenerateStubsKotlin.onlyIf{ false }
|
||||
tasks.compileKotlin.onlyIf{ false }
|
||||
tasks.inspectClassesForKotlinIC.onlyIf{ false }
|
||||
}
|
||||
|
||||
//comp** classes are only used for code generation
|
||||
|
@ -25,4 +25,4 @@ org.gradle.caching=true
|
||||
#used for slow jitpack builds; TODO see if this actually works
|
||||
org.gradle.internal.http.socketTimeout=100000
|
||||
org.gradle.internal.http.connectionTimeout=100000
|
||||
archash=e0e7849952
|
||||
archash=39383f973e
|
||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
Loading…
Reference in New Issue
Block a user