Update Gradle
This commit is contained in:
parent
6342756105
commit
eef8ee3934
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.oscim.android.test"
|
|
||||||
android:installLocation="auto"
|
android:installLocation="auto"
|
||||||
android:versionCode="1"
|
android:versionCode="1"
|
||||||
android:versionName="1.0">
|
android:versionName="1.0">
|
||||||
|
@ -24,6 +24,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'org.oscim.android.test'
|
||||||
compileSdk androidCompileSdk()
|
compileSdk androidCompileSdk()
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
@ -13,7 +13,7 @@ sourceSets {
|
|||||||
|
|
||||||
file('natives').eachDir() { dir ->
|
file('natives').eachDir() { dir ->
|
||||||
task("nativesJar-${dir.name}", type: Jar) {
|
task("nativesJar-${dir.name}", type: Jar) {
|
||||||
classifier "natives-${dir.name}"
|
archiveClassifier = "natives-${dir.name}"
|
||||||
from(dir.path)
|
from(dir.path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@ sourceSets {
|
|||||||
|
|
||||||
file('natives').eachDir() { dir ->
|
file('natives').eachDir() { dir ->
|
||||||
task("nativesJar-${dir.name}", type: Jar) {
|
task("nativesJar-${dir.name}", type: Jar) {
|
||||||
classifier "natives-${dir.name}"
|
archiveClassifier = "natives-${dir.name}"
|
||||||
from(dir.path)
|
from(dir.path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.oscim.app"
|
|
||||||
android:installLocation="auto"
|
android:installLocation="auto"
|
||||||
android:versionCode="1"
|
android:versionCode="1"
|
||||||
android:versionName="1.0">
|
android:versionName="1.0">
|
||||||
|
@ -10,6 +10,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'org.oscim.app'
|
||||||
compileSdk androidCompileSdk()
|
compileSdk androidCompileSdk()
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
@ -12,7 +12,7 @@ sourceSets {
|
|||||||
|
|
||||||
file('natives').eachDir() { dir ->
|
file('natives').eachDir() { dir ->
|
||||||
task("nativesJar-${dir.name}", type: Jar) {
|
task("nativesJar-${dir.name}", type: Jar) {
|
||||||
classifier "natives-${dir.name}"
|
archiveClassifier = "natives-${dir.name}"
|
||||||
from(dir.path)
|
from(dir.path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ tasks.withType(JavaCompile) {
|
|||||||
|
|
||||||
task nativesJar(type: Jar) {
|
task nativesJar(type: Jar) {
|
||||||
dependsOn copyVtmResources, copyVtmThemesResources
|
dependsOn copyVtmResources, copyVtmThemesResources
|
||||||
classifier 'natives'
|
archiveClassifier = 'natives'
|
||||||
from('natives')
|
from('natives')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ run {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
|
task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
|
||||||
classifier 'jar-with-dependencies'
|
archiveClassifier = 'jar-with-dependencies'
|
||||||
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
|
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||||
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/services/io.jeo.data.Driver'
|
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/services/io.jeo.data.Driver'
|
||||||
manifest {
|
manifest {
|
||||||
|
@ -26,7 +26,7 @@ sourceSets {
|
|||||||
mainClassName = "org.oscim.theme.comparator.Main"
|
mainClassName = "org.oscim.theme.comparator.Main"
|
||||||
|
|
||||||
task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
|
task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
|
||||||
classifier 'jar-with-dependencies'
|
archiveClassifier = 'jar-with-dependencies'
|
||||||
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
|
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||||
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
|
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
|
||||||
manifest {
|
manifest {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user