Update AttachExtended Project to be compatible with Attach project la…

…test (4.0.22-SNAPSHOT). Aligned AttachExtended version e.g. 4.0.22-SNAPSHOT with Attach Project.
gluonhq · Dec 5, 2024 · 4319c05 · 4319c05
1 parent 19b2e22
commit 4319c05
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: macos-11
+    runs-on: macos-latest
     strategy:
       fail-fast: false
     steps:
@@ -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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     name: Deploy
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -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

diff --git a/.gitignore b/.gitignore
@@ -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*
diff --git a/build.gradle b/build.gradle
@@ -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"
@@ -34,6 +34,7 @@ subprojects {
     }
 
     javafx {
+        version = "20.0.2"
         modules 'javafx.graphics'
     }
 }
@@ -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")

diff --git a/gradle.properties b/gradle.properties
@@ -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
diff --git a/gradle/android_project/build.gradle b/gradle/android_project/build.gradle
@@ -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'
     }
 }
 

diff --git a/gradle/android_project/library/build.gradle b/gradle/android_project/library/build.gradle
@@ -4,11 +4,11 @@ android {
 
     namespace 'com.gluonhq.helloandroid'
 
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
     }
 
     dependencies {

diff --git a/gradle/native-build.gradle b/gradle/native-build.gradle
@@ -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