Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit21b56cb

Browse files
committed
Tidyup version 2
1 parentddbb132 commit21b56cb

File tree

4 files changed

+8
-39
lines changed

4 files changed

+8
-39
lines changed

‎SwiftJava.xcodeproj/project.pbxproj

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,16 @@
3636
BBCCEF9A1F3C83440084F9E3 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = BBCCEF991F3C83440084F9E3 /* LICENSE */; };
3737
BBF280D91D64BC6100A7AF5D /* src in Resources */ = {isa = PBXBuildFile; fileRef = BBF280D81D64BC6100A7AF5D /* src */; };
3838
CE3185101F368D6B002046A6 /* SwiftHelloTypes_TextListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE31850E1F368D44002046A6 /* SwiftHelloTypes_TextListener.swift */; };
39-
CE4A25031F34B37C003AF384 /* JNIMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A24FB1F34B37C003AF384 /* JNIMethod.swift */; };
40-
CE4A25041F34B37C003AF384 /* JNIType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A24FC1F34B37C003AF384 /* JNIType.swift */; };
41-
CE4A25051F34B37C003AF384 /* JNICore.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A24FD1F34B37C003AF384 /* JNICore.swift */; };
42-
CE4A25061F34B37C003AF384 /* JavaClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A24FE1F34B37C003AF384 /* JavaClass.swift */; };
43-
CE4A25071F34B37C003AF384 /* JNIObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A24FF1F34B37C003AF384 /* JNIObject.swift */; };
44-
CE4A25081F34B37C003AF384 /* Runnable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25001F34B37C003AF384 /* Runnable.swift */; };
45-
CE4A25091F34B37C003AF384 /* JavaObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25011F34B37C003AF384 /* JavaObject.swift */; };
46-
CE4A250A1F34B37C003AF384 /* JNIField.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25021F34B37C003AF384 /* JNIField.swift */; };
4739
CE4A250B1F34B3E0003AF384 /* JavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBCD66ED1D36A03F00DF5E47 /* JavaVM.framework */; };
4840
CE4A25101F3555CA003AF384 /* com_johnholdsworth in Resources */ = {isa = PBXBuildFile; fileRef = CE4A250F1F3555CA003AF384 /* com_johnholdsworth */; };
4941
CE4A25191F355910003AF384 /* SwiftHelloTest_SwiftTestListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25151F355902003AF384 /* SwiftHelloTest_SwiftTestListener.swift */; };
5042
CE4A251A1F355914003AF384 /* SwiftHelloTest_TestResponderAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25141F355902003AF384 /* SwiftHelloTest_TestResponderAdapter.swift */; };
5143
CE4A251B1F355918003AF384 /* SwiftHelloTestImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25131F355902003AF384 /* SwiftHelloTestImpl.swift */; };
5244
CE4A25211F355CAC003AF384 /* SwiftHelloTest_TestListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A251F1F355CA6003AF384 /* SwiftHelloTest_TestListener.swift */; };
5345
CE4A25241F3563AB003AF384 /* JavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBCD66ED1D36A03F00DF5E47 /* JavaVM.framework */; };
54-
CE649E311F39E88200C5B7FE /* SwiftHelloTypes.java in Sources */ = {isa = PBXBuildFile; fileRef = CE649E2D1F39E88200C5B7FE /* SwiftHelloTypes.java */; };
55-
CE649E321F39E88200C5B7FE /* SwiftHelloBinding.java in Sources */ = {isa = PBXBuildFile; fileRef = CE649E2F1F39E88200C5B7FE /* SwiftHelloBinding.java */; };
56-
CE649E331F39E88200C5B7FE /* SwiftHelloTest.java in Sources */ = {isa = PBXBuildFile; fileRef = CE649E301F39E88200C5B7FE /* SwiftHelloTest.java */; };
5746
CE6BB1D81F33E59900CA6A8F /* java_swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBC13E821D4996AE0035A039 /* java_swift.framework */; };
5847
CE6BB1D91F33E5AD00CA6A8F /* CJavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBC13E601D49954A0035A039 /* CJavaVM.framework */; };
5948
CE81023A1F3693510069563B /* MainActivity.kt in Resources */ = {isa = PBXBuildFile; fileRef = CE8102391F3693510069563B /* MainActivity.kt */; };
60-
CE81023C1F3693790069563B /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE81023B1F3693790069563B /* main.swift */; };
61-
CE81023E1F369D8D0069563B /* SwiftHello.java in Sources */ = {isa = PBXBuildFile; fileRef = CE81023D1F369D8D0069563B /* SwiftHello.java */; };
62-
CE85B31C1F3655DD0014857D /* JavaMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE85B3191F3655DD0014857D /* JavaMap.swift */; };
63-
CE85B31D1F3655DD0014857D /* HashMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE85B31A1F3655DD0014857D /* HashMap.swift */; };
64-
CE85B31E1F3655DD0014857D /* JavaSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE85B31B1F3655DD0014857D /* JavaSet.swift */; };
6549
/* End PBXBuildFile section */
6650

6751
/* Begin PBXContainerItemProxy section */
@@ -640,7 +624,7 @@
640624
CreatedOnToolsVersion = 8.0;
641625
DevelopmentTeam = 9V5A8WE85E;
642626
DevelopmentTeamName = "John Holdsworth";
643-
LastSwiftMigration =0800;
627+
LastSwiftMigration =0900;
644628
ProvisioningStyle = Automatic;
645629
};
646630
BB8AC4611D3F11E600BD5B0F = {
@@ -654,6 +638,7 @@
654638
CreatedOnToolsVersion = 8.0;
655639
DevelopmentTeam = 9V5A8WE85E;
656640
DevelopmentTeamName = "John Holdsworth";
641+
LastSwiftMigration = 0900;
657642
ProvisioningStyle = Automatic;
658643
};
659644
};
@@ -805,38 +790,22 @@
805790
isa = PBXSourcesBuildPhase;
806791
buildActionMask = 2147483647;
807792
files = (
808-
CE649E331F39E88200C5B7FE /* SwiftHelloTest.java in Sources */,
809-
CE85B31C1F3655DD0014857D /* JavaMap.swift in Sources */,
810-
CE4A25041F34B37C003AF384 /* JNIType.swift in Sources */,
811-
CE4A25031F34B37C003AF384 /* JNIMethod.swift in Sources */,
812-
CE4A25051F34B37C003AF384 /* JNICore.swift in Sources */,
813793
BB5ACFDF1D35B09900E2386A /* AppDelegate.swift in Sources */,
814-
CE649E321F39E88200C5B7FE /* SwiftHelloBinding.java in Sources */,
815-
CE4A25091F34B37C003AF384 /* JavaObject.swift in Sources */,
816-
CE85B31E1F3655DD0014857D /* JavaSet.swift in Sources */,
817-
CE81023C1F3693790069563B /* main.swift in Sources */,
818-
CE85B31D1F3655DD0014857D /* HashMap.swift in Sources */,
819-
CE4A250A1F34B37C003AF384 /* JNIField.swift in Sources */,
820-
CE4A25071F34B37C003AF384 /* JNIObject.swift in Sources */,
821-
CE4A25061F34B37C003AF384 /* JavaClass.swift in Sources */,
822-
CE4A25081F34B37C003AF384 /* Runnable.swift in Sources */,
823-
CE649E311F39E88200C5B7FE /* SwiftHelloTypes.java in Sources */,
824-
CE81023E1F369D8D0069563B /* SwiftHello.java in Sources */,
825794
);
826795
runOnlyForDeploymentPostprocessing = 0;
827796
};
828797
BB8AC45E1D3F11E600BD5B0F /* Sources */ = {
829798
isa = PBXSourcesBuildPhase;
830799
buildActionMask = 2147483647;
831800
files = (
801+
BBBF3A691D4BCE36004142AE /* main.swift in Sources */,
832802
BBBF3A591D4A8B88004142AE /* ImageCanvas.swift in Sources */,
833803
BBBF3A571D4A8B45004142AE /* SimpleEx.swift in Sources */,
834804
BBBF3A5B1D4A8C27004142AE /* FocusTest.swift in Sources */,
835805
BBBF3A651D4B189F004142AE /* MenuDemo.swift in Sources */,
836806
BBBF3A631D4AC26B004142AE /* JComboBox.swift in Sources */,
837807
BBBF3A551D4A8ADD004142AE /* SimpleJTreeExample.swift in Sources */,
838808
BBBF3A531D4A8A68004142AE /* PhilosophersJList.swift in Sources */,
839-
BBBF3A691D4BCE36004142AE /* main.swift in Sources */,
840809
BBBF3A671D4B1B95004142AE /* PopupTest.swift in Sources */,
841810
BBBF3A611D4AC24F004142AE /* TableColumnColor.swift in Sources */,
842811
BBBF3A731D4BF8CF004142AE /* AWTGraphicsDemo.swift in Sources */,
@@ -849,10 +818,10 @@
849818
isa = PBXSourcesBuildPhase;
850819
buildActionMask = 2147483647;
851820
files = (
821+
BBC13DB91D48FDCE0035A039 /* org_swiftjava.swift in Sources */,
852822
CE4A25211F355CAC003AF384 /* SwiftHelloTest_TestListener.swift in Sources */,
853823
CE4A25191F355910003AF384 /* SwiftHelloTest_SwiftTestListener.swift in Sources */,
854824
BBC13DC21D4900AA0035A039 /* SwiftTest.swift in Sources */,
855-
BBC13DB91D48FDCE0035A039 /* org_swiftjava.swift in Sources */,
856825
CE3185101F368D6B002046A6 /* SwiftHelloTypes_TextListener.swift in Sources */,
857826
CE4A251A1F355914003AF384 /* SwiftHelloTest_TestResponderAdapter.swift in Sources */,
858827
CE4A251B1F355918003AF384 /* SwiftHelloTestImpl.swift in Sources */,

‎genhello.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export COMPANY=johnholdsworth
1717
\rm -rf ../{swift-android-samples,swift-android-kotlin}/*/src/main/java/org/swiftjava/com_$COMPANY
1818

1919
# compile bindings and package them into for jar for genswift.sh
20-
$JAVA_HOME/bin/javac -parameters com/$COMPANY/swiftbindings/*.java&&
20+
$JAVA_HOME/bin/javac -Xlint:unchecked -parameters com/$COMPANY/swiftbindings/*.java&&
2121

2222
$JAVA_HOME/bin/jar cf /tmp/swifthello.jar com/$COMPANY/swiftbindings/*.class&&
2323

‎genpkg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ XCODEBUILD=/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild
1111
export JAVA_HOME=${JAVA_HOME:-/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home}
1212

1313
foriin$*;do
14-
./genswift.sh$i$JAVA_HOME/jre/lib/rt.jar
15-
./overrides.pl$i
14+
"$PWD/genswift.sh"$i$JAVA_HOME/jre/lib/rt.jar&&
15+
./overrides.pl$i&&
1616
whiletrue;do
1717
($XCODEBUILD SYMROOT=/tmp -config Debug -target examples -project SwiftJava.xcodeproj; STATUS=$?)| tee -a$i/build.log
1818
./overrides.pl$i

‎genswift.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ TARGET_JAR=${2:-$JAVA_HOME/jre/lib/rt.jar}
2020

2121
PACKAGE_ORDER=${3:-java/lang|java/util|java/sql|java/awt|javax/swing}
2222

23-
cd"$(dirname"$0")/src"&&$JAVA_HOME/bin/javac -d ../bin genswift.java&&cd-&&
23+
cd"$(dirname"$0")/src"&&$JAVA_HOME/bin/javac -d ../bin genswift.java&&cd"$(dirname"$0")"&&
2424

2525
$JAVA_HOME/bin/jar tf"$TARGET_JAR"| egrep"^($FILTER)"| sed"s@\\.class\$@@"|$JAVA_HOME/bin/java -cp"$TARGET_JAR:bin" genswift"$PACKAGE_ORDER"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp