Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update publishing to new gradle plugin #39

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update publishing to new gradle plugin #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c10ce4d
feat: Switch to new maven publish plugin
Berstanio Oct 5, 2023
44308fa
chore: Upgrade gradle to 7.3.3
Berstanio Oct 5, 2023
6f3bf24
feat: Implement override.gradle capability
Berstanio Oct 5, 2023
eff5da5
fix: Revert accidental api -> implementation change
Berstanio Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 0 additions & 90 deletions androidpublish.gradle
View file
Open in desktop

This file was deleted.

21 changes: 7 additions & 14 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath "org.wisepersist:gwt-gradle-plugin:1.0.13"
classpath "com.android.tools.build:gradle:4.1.3"
classpath "com.android.tools.build:gradle:7.2.2"
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.19'
}
}
Expand All @@ -27,15 +27,6 @@ allprojects {
return project.hasProperty("RELEASE")
}

isLocalBuild = {
return project.hasProperty("LOCAL")
}

getLocalRepositoryUrl = {
return project.hasProperty('LOCAL_REPOSITORY_URL') ? LOCAL_REPOSITORY_URL
: 'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath
}

getReleaseRepositoryUrl = {
return project.hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
Expand Down Expand Up @@ -73,9 +64,11 @@ allprojects {
tasks.withType(Test) {
systemProperty 'file.encoding', 'UTF-8'
}

tasks.withType(Sign) {
onlyIf { isReleaseBuild() }
}
}

apply from: rootProject.file('publish.gradle')

if(rootProject.file('override.gradle').exists())
apply from: rootProject.file('override.gradle')


12 changes: 8 additions & 4 deletions gdx-controllers-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ project.group = 'com.badlogicgames.gdx-controllers'
android {

compileSdkVersion 29
buildToolsVersion '29.0.3'

defaultConfig {
minSdkVersion 16
Expand All @@ -29,6 +28,13 @@ android {
lintOptions {
abortOnError false
}

publishing {
singleVariant("release") {
withSourcesJar()
withJavadocJar()
}
}
}

dependencies {
Expand All @@ -38,6 +44,4 @@ dependencies {

ext {
ARTIFACTID = 'gdx-controllers-android'
}

apply from : '../androidpublish.gradle'
}
1 change: 0 additions & 1 deletion gdx-controllers-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: 'java-library'

apply from: '../publish.gradle'

configurations {
custom
Expand Down
1 change: 0 additions & 1 deletion gdx-controllers-desktop/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: 'java-library'

apply from: '../publish.gradle'

configurations {
custom
Expand Down
1 change: 0 additions & 1 deletion gdx-controllers-gwt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: 'java-library'


apply from: '../publish.gradle'

configurations {
custom
Expand Down
1 change: 0 additions & 1 deletion gdx-controllers-ios/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: 'java-library'
apply plugin: 'robovm'

apply from: '../publish.gradle'

configurations {
custom
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Sep 07 22:26:25 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
Loading