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.

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

dependency updates #472

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get update \
git \
imagemagick \
make \
openjdk-11-jdk \
openjdk-17-jdk \
python3-pip \
python3-setuptools \
unzip \
Expand Down
1 change: 0 additions & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.agateau.tinywheels.android"
android:installLocation="auto">

<uses-feature android:name="android.software.leanback" android:required="false" />
Expand Down
18 changes: 11 additions & 7 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ dependencies {
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion"
implementation "androidx.core:core:1.6.0"
implementation "androidx.core:core:1.13.1"
}

android {
namespace "com.agateau.tinywheels.android"
Properties versionProps = new Properties()
versionProps.load(new FileInputStream(file('../version.properties')))

// Must match ci/install-android-sdk
buildToolsVersion "31.0.0"
compileSdkVersion 34
defaultConfig {
applicationId "com.agateau.tinywheels.android"
minSdkVersion 19
targetSdkVersion 34
minSdk 19
targetSdk 34
// Must match ci/install-android-sdk
compileSdk 34
versionCode versionProps['VERSION_CODE'].toInteger()
versionName versionProps['VERSION']
}

flavorDimensions 'store'
flavorDimensions = ['store']
productFlavors {
itchio {
dimension 'store'
Expand Down Expand Up @@ -95,6 +95,10 @@ android {
excludes += ['LICENSE.txt']
}
}
buildFeatures {
renderScript true
aidl true
}
}

// called every time gradle gets executed, takes the native dependencies of
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
agp_version = '7.4.1'
agp_version = '8.7.1'
}
repositories {
mavenCentral()
Expand Down
4 changes: 3 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ task generateVersionInfoClass {
}
}

sourceCompatibility = JavaVersion.VERSION_1_8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
}
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

compileJava.dependsOn(generateVersionInfoClass)
Expand Down
4 changes: 3 additions & 1 deletion desktop/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ dependencies {
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
}

sourceCompatibility = JavaVersion.VERSION_1_8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
}
sourceSets.main.java.srcDirs = [ "src/" ]

project.ext.mainClassName = "com.agateau.pixelwheels.desktop.DesktopLauncher"
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ org.gradle.jvmargs=-Xms128m -Xmx512m
org.gradle.configureondemand=true
android.useAndroidX=true
android.enableJetifier=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Oct 17 19:47:47 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading