mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-11 08:15:35 +03:00
Updated RoboVM / Switched to hard-coded SDK platform jar
This commit is contained in:
parent
625f2640d8
commit
e23837a4ba
@ -18,12 +18,6 @@ configurations{ natives }
|
||||
repositories{
|
||||
mavenCentral()
|
||||
maven{ url "https://maven.google.com" }
|
||||
|
||||
ivy{
|
||||
url 'https://github.com/'
|
||||
patternLayout{ artifact '/[organisation]/[module]/raw/master/backends/backend-android/libs/android.jar' }
|
||||
metadataSources{ artifact() }
|
||||
}
|
||||
}
|
||||
|
||||
task deploy(type: Copy){
|
||||
@ -35,7 +29,7 @@ task deploy(type: Copy){
|
||||
}
|
||||
|
||||
android{
|
||||
buildToolsVersion '30.0.2'
|
||||
buildToolsVersion '30.0.3'
|
||||
compileSdkVersion 30
|
||||
sourceSets{
|
||||
main{
|
||||
@ -145,8 +139,9 @@ dependencies{
|
||||
gpImplementation "com.google.android.gms:play-services-games:21.0.0"
|
||||
gpImplementation "com.google.android.gms:play-services-auth:19.0.0"
|
||||
|
||||
//android dependencies magically disappear during compilation, thanks gradle!
|
||||
compileOnly "Anuken:Arc:android"
|
||||
//TODO dynamically find best android platform jar instead of hard-coding to 30
|
||||
def sdkFile = new File((String)findSdkDir(), "/platforms/android-30/android.jar")
|
||||
if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
|
||||
}
|
||||
|
||||
task copyAndroidNatives(){
|
||||
|
14
build.gradle
14
build.gradle
@ -13,22 +13,10 @@ buildscript{
|
||||
google()
|
||||
maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
|
||||
maven{ url 'https://jitpack.io' }
|
||||
|
||||
//fake repository to download my patched robovm jar from
|
||||
ivy{
|
||||
url 'https://github.com/'
|
||||
patternLayout{ artifact '/[organisation]/[module]/raw/a-single-jar-file/[revision].jar' }
|
||||
metadataSources{ artifact() }
|
||||
}
|
||||
}
|
||||
|
||||
dependencies{
|
||||
//use local, patched robovm gradle plugin until my PR for gradle 7.0 support is merged
|
||||
//https://github.com/Anuken/robovm/raw/a-single-jar-file/robovm-gradle-plugin-2.3.14-SNAPSHOT.jar
|
||||
classpath "Anuken:robovm:robovm-gradle-plugin-2.3.14-SNAPSHOT"
|
||||
//needed for plugin above
|
||||
classpath "com.mobidevelop.robovm:robovm-dist-compiler:2.3.13"
|
||||
|
||||
classpath "com.mobidevelop.robovm:robovm-gradle-plugin:2.3.14"
|
||||
classpath "com.github.Anuken.Arc:packer:$arcHash"
|
||||
classpath "com.github.Anuken.Arc:arc-core:$arcHash"
|
||||
}
|
||||
|
@ -11,4 +11,4 @@ android.useAndroidX=true
|
||||
#used for slow jitpack builds; TODO see if this actually works
|
||||
http.socketTimeout=80000
|
||||
http.connectionTimeout=80000
|
||||
archash=72627de9b81e7143af4ebe1d1f9d54099ade8fd3
|
||||
archash=43f8f93e80779f91fad622acfae70cdc300edecf
|
||||
|
Loading…
Reference in New Issue
Block a user