Skip to content

Commit 352f23e

Browse files
Support java 25
1 parent fcc119a commit 352f23e

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

base/src/main/java/proguard/classfile/JavaVersionConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,5 @@ public class JavaVersionConstants {
5454
public static final String CLASS_VERSION_22 = "22";
5555
public static final String CLASS_VERSION_23 = "23";
5656
public static final String CLASS_VERSION_24 = "24";
57+
public static final String CLASS_VERSION_25 = "25";
5758
}

base/src/main/java/proguard/classfile/VersionConstants.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public class VersionConstants {
7373
public static final int CLASS_VERSION_23_MINOR = 0;
7474
public static final int CLASS_VERSION_24_MAJOR = 68;
7575
public static final int CLASS_VERSION_24_MINOR = 0;
76+
public static final int CLASS_VERSION_25_MAJOR = 69;
77+
public static final int CLASS_VERSION_25_MINOR = 0;
7678
public static final int PREVIEW_VERSION_MINOR = 65535;
7779

7880
public static final int CLASS_VERSION_1_0 =
@@ -123,7 +125,8 @@ public class VersionConstants {
123125
(CLASS_VERSION_23_MAJOR << 16) | CLASS_VERSION_23_MINOR;
124126
public static final int CLASS_VERSION_24 =
125127
(CLASS_VERSION_24_MAJOR << 16) | CLASS_VERSION_24_MINOR;
126-
128+
public static final int CLASS_VERSION_25 =
129+
(CLASS_VERSION_25_MAJOR << 16) | CLASS_VERSION_25_MINOR;
127130
public static final int MAX_SUPPORTED_VERSION =
128-
(CLASS_VERSION_24_MAJOR << 16) | PREVIEW_VERSION_MINOR;
131+
(CLASS_VERSION_25_MAJOR << 16) | PREVIEW_VERSION_MINOR;
129132
}

base/src/main/java/proguard/classfile/util/ClassUtil.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ public static int internalClassVersion(String externalClassVersion) {
150150
return VersionConstants.CLASS_VERSION_23;
151151
case JavaVersionConstants.CLASS_VERSION_24:
152152
return VersionConstants.CLASS_VERSION_24;
153+
case JavaVersionConstants.CLASS_VERSION_25:
154+
return VersionConstants.CLASS_VERSION_25;
153155
}
154156
return 0;
155157
}
@@ -210,6 +212,8 @@ public static String externalClassVersion(int internalClassVersion) {
210212
return JavaVersionConstants.CLASS_VERSION_23;
211213
case VersionConstants.CLASS_VERSION_24:
212214
return JavaVersionConstants.CLASS_VERSION_24;
215+
case VersionConstants.CLASS_VERSION_25:
216+
return JavaVersionConstants.CLASS_VERSION_25;
213217
default:
214218
return null;
215219
}

docs/md/releasenotes.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
## Version 9.1.12
1+
## Version 9.2.0
22

33
### API changes for line number handling
44

55
- Add new StructuredLineNumberInfo class.
66
- Deprecate ExtendedLineNumberInfo class.
77
- Adapt utilities to generate StructuredLineNumberInfo instead of ExtendedLineNumberInfo.
88

9+
### Java support
10+
11+
- Update maximum supported Java class version to 69.65535 (Java 25).
12+
913
## Version 9.1.11
1014

1115
### Kotlin support

0 commit comments

Comments
 (0)