Skip to content

Commit

Permalink
Update gradle (#29)
Browse files Browse the repository at this point in the history
* Update gradle project

* Remove unused config

* Remove unused file

* Use correct task in workflow

* Add gdx as dependency

* Use JDK 11

* Remove debug statements

* Remove shadow plugin

* Reference correct task name
  • Loading branch information
fourlastor authored Nov 19, 2023
1 parent 8f96ef9 commit 112aae4
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 251 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Local install
run: ./gradlew clean uploadArchives -PSNAPSHOT=true -PLOCAL=true
run: ./gradlew clean publish -PSNAPSHOT=true -PLOCAL=true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Then add the needed dependencies to your project. You will find the artifact ids
### Building from source
To build from source, clone or download this repository, then open it in Android Studio. Perform the following command to compile and upload the library in your local repository:

gradlew clean uploadArchives -PLOCAL=true
gradlew clean publish -PLOCAL=true

See `build.gradle` file for current version to use in your dependencies.

Expand Down
146 changes: 0 additions & 146 deletions androidpublish.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ allprojects {

group = GROUPID
version = VERSION
}
}
22 changes: 9 additions & 13 deletions core-mapping/build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
apply plugin : 'java-library'
plugins {
id 'java-library'
}

apply from: '../publish.gradle'

configurations {
custom
compile.extendsFrom custom
}

eclipse {
project {
name = appName + "-core-mapping"
}
}

dependencies {
compile "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"

testCompile "junit:junit:4.12"
testCompile "org.mockito:mockito-core:2.2.7"
testImplementation "junit:junit:4.12"
testImplementation "org.mockito:mockito-core:2.2.7"

testCompile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
testCompile "com.badlogicgames.gdx:gdx:$gdxVersion"
testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
testImplementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
testImplementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
}

targetCompatibility = 1.7
Expand All @@ -36,4 +33,3 @@ sourceSets.test.java.srcDirs = [ "test/" ]
ext {
ARTIFACTID = 'gdx-controllerutils-mapping'
}

10 changes: 3 additions & 7 deletions core-scene2d/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
apply plugin : 'java-library'
plugins {
id 'java-library'
}

apply from: '../publish.gradle'

configurations {
custom
compile.extendsFrom custom
}

eclipse {
project {
name = appName + "-core-scene2d"
Expand All @@ -29,4 +26,3 @@ sourceSets.test.java.srcDirs = [ "test/" ]
ext {
ARTIFACTID = 'gdx-controllerutils-scene2d'
}

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
Loading

0 comments on commit 112aae4

Please sign in to comment.