Skip to content

Commit 6e670fb

Browse files
committed
Dev: ignore processing without module description
1 parent fa0e132 commit 6e670fb

File tree

9 files changed

+83
-48
lines changed

9 files changed

+83
-48
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.21'
2+
ext.kotlin_version = '2.0.21'
33

44
repositories {
55
google()
@@ -10,8 +10,8 @@ buildscript {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.4.2'
14-
classpath "com.readdle.android.swift:gradle:1.4.5"
13+
classpath 'com.android.tools.build:gradle:8.3.2'
14+
classpath "com.readdle.android.swift:gradle:6.0.3"
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
1717
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
@@ -34,5 +34,5 @@ apply from: "${rootDir}/publish-root.gradle"
3434

3535
ext {
3636
PUBLISH_GROUP_ID = 'com.readdle.swift.java.codegen'
37-
PUBLISH_VERSION = "0.9.5"
37+
PUBLISH_VERSION = "0.9.6"
3838
}

compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
6464

6565
moduleDescriptor = new Gson().fromJson(packageJson, SwiftModuleDescriptor.class);
6666
if (moduleDescriptor == null) {
67-
error(null, "No package description with option: com.readdle.codegen.package");
6867
return;
6968
}
7069

gradle/wrapper/gradle-wrapper.jar

-15.6 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 31 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 21 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/build.gradle

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ swift {
1313
}
1414

1515
android {
16-
compileSdkVersion 31
16+
namespace = "com.readdle.swiftjava.sample"
17+
compileSdkVersion 34
1718
defaultConfig {
1819
applicationId "com.readdle.swiftjava.sample"
19-
minSdkVersion 21
20-
targetSdkVersion 31
20+
minSdkVersion 24
21+
targetSdkVersion 34
2122
versionCode 1
2223
versionName "1.0"
2324
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -35,6 +36,16 @@ android {
3536
}
3637
}
3738
}
39+
40+
compileOptions {
41+
sourceCompatibility = JavaVersion.VERSION_11
42+
targetCompatibility = JavaVersion.VERSION_11
43+
}
44+
45+
kotlinOptions {
46+
jvmTarget = "11"
47+
}
48+
3849
buildTypes {
3950
release {
4051
debuggable false
@@ -55,10 +66,10 @@ dependencies {
5566
kapt project(':compiler')
5667
implementation project(':library')
5768

58-
implementation "androidx.appcompat:appcompat:1.3.1"
59-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
69+
implementation "androidx.appcompat:appcompat:1.7.0"
70+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
6071
testImplementation 'junit:junit:4.13.2'
61-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
62-
androidTestImplementation 'androidx.test:rules:1.4.0'
63-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
72+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
73+
androidTestImplementation 'androidx.test:rules:1.6.1'
74+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
6475
}

sample/src/main/swift/Package.resolved

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/src/main/swift/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
.library(name: packageName, type: .dynamic, targets: [generatedName])
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/readdle/java_swift.git", .upToNextMinor(from: "2.2.0")),
16+
.package(url: "https://github.com/readdle/java_swift.git", .upToNextMinor(from: "2.2.3")),
1717
.package(url: "https://github.com/readdle/swift-java.git", .upToNextMinor(from: "0.3.0")),
1818
.package(url: "https://github.com/readdle/swift-java-coder.git", .upToNextMinor(from: "1.1.2")),
1919
.package(url: "https://github.com/readdle/swift-anycodable.git", .upToNextMinor(from: "1.0.3")),

0 commit comments

Comments
 (0)