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

Update AttachExtended Project to be compatible with Attach project latest (4.0.22-SNAPSHOT) #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
name: Build
runs-on: macos-11
runs-on: macos-latest
strategy:
fail-fast: false
steps:
Expand All @@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
java-version: '17'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
build:
name: Deploy
runs-on: macos-11
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
java-version: '17'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
26 changes: 26 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Idea
.idea/
*.iml

# Gradle
build/
.gradle/

# Netbeans
/.nb-gradle/

# VS Code
.classpath
.project
.settings/
.vscode/
bin/

# Compiled class file
*.class

# Log file
*.log

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (System.getProperty('os.name').toLowerCase().contains("mac")) {
ext.IOS_VERSION = ""
}

ext.libraryVersions = [attach: '4.0.20']
ext.libraryVersions = [attach: '4.0.22-SNAPSHOT']

subprojects {
apply plugin: "org.openjfx.javafxplugin"
Expand All @@ -34,6 +34,7 @@ subprojects {
}

javafx {
version = "20.0.2"
modules 'javafx.graphics'
}
}
Expand All @@ -52,7 +53,7 @@ task copyModuleSources {
javadoc {
doFirst {
subprojects.each {p -> classpath += p.sourceSets.main.compileClasspath }
options.addStringOption('-module-path', classpath.asPath)
options.modulePath = new ArrayList(classpath.files)
}
exclude("com/gluonhq/attach/*/impl")
source fileTree("${buildDir}/modules/sources")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group = com.gluonhq.attachextended
version = 4.0.15-SNAPSHOT
version = 4.0.22-SNAPSHOT

# disable publish of sha256, sha512
systemProp.org.gradle.internal.publish.checksums.insecure=true
2 changes: 1 addition & 1 deletion gradle/android_project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.1'
classpath 'com.android.tools.build:gradle:8.5.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/android_project/library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {

namespace 'com.gluonhq.helloandroid'

compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion gradle/native-build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def sdkPath(String platform) {
return "/Applications/Xcode.app/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${IOS_VERSION}.sdk";
}

def AndroidPlatform = 33
def AndroidPlatform = 34

configurations {
util
Expand Down