Skip to content

Rebuilding tiwebviewfragment for Titanium 6.0 #8

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.

Sign up for GitHub

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

Open
anthonychung wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Rebuilding tiwebviewfragment for Titanium 6.0 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f426d0d
updates to make titanium 6 compatiable
anthonychung Jan 12, 2017
467bb75
updates for titanium 6.0
anthonychung Jan 12, 2017
88c2226
adding compiled module
anthonychung Jan 12, 2017
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="build/.apt_generated"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/Users/marcelpociot/Library/android-sdk-macosx/add-ons/addon-google_apis-google-10/libs/maps.jar"/>
<classpathentry kind="lib" path="/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android/titanium.jar"/>
<classpathentry kind="lib" path="/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android/kroll-common.jar"/>
<classpathentry kind="lib" path="/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android/kroll-apt.jar"/>
<classpathentry kind="lib" path="/Users/ant/Library/Android/sdk/add-ons/addon-google_apis-google-23/libs/maps.jar"/>
<classpathentry kind="lib" path="/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android/titanium.jar"/>
<classpathentry kind="lib" path="/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android/kroll-common.jar"/>
<classpathentry kind="lib" path="/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android/kroll-apt.jar"/>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="/Users/marcelpociot/Library/android-sdk-macosx/platforms/android-16/android.jar"/>
<classpathentry kind="lib" path="/Users/ant/Library/Android/sdk/platforms/android-23/android.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
tmp
bin
build
*.zip
.apt_generated
11 changes: 7 additions & 4 deletions build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
titanium.platform=/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android
android.platform=/Users/marcelpociot/Library/android-sdk-macosx/platforms/android-16
google.apis=/Users/marcelpociot/Library/android-sdk-macosx/add-ons/addon-google_apis-google-16
android.ndk=/Users/marcelpociot/Downloads/android-ndk-r9d
titanium.platform=/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android
# android.platform=/Users/ant/Library/Android/sdk/platforms/android-19
android.platform=/Users/ant/Library/Android/sdk/platforms/android-23
# google.apis=/Users/ant/Library/Android/sdk/add-ons/addon-google_apis-google-16
google.apis=/Users/ant/Library/Android/sdk/add-ons/addon-google_apis-google-23
# android.ndk=/Users/ant/Developer/tools/android-ndk-r9d
android.ndk=/Users/ant/Developer/tools/android-ndk-r11c
Binary file added dist/de.marcelpociot.webviewfragment-android-2.0.zip
View file
Open in desktop
Binary file not shown.
Binary file modified dist/webviewfragment.jar
View file
Open in desktop
Binary file not shown.
Binary file modified libs/armeabi-v7a/libde.marcelpociot.webviewfragment.so
View file
Open in desktop
Binary file not shown.
Binary file removed libs/armeabi/libde.marcelpociot.webviewfragment.so
View file
Open in desktop
Binary file not shown.
Binary file modified libs/x86/libde.marcelpociot.webviewfragment.so
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 1.0
apiversion: 2
version: 2.0
apiversion: 3
architectures: armeabi-v7a x86
description: My module
author: Marcel Pociot
license: MIT
Expand All @@ -15,4 +16,4 @@ name: webviewfragment
moduleid: de.marcelpociot.webviewfragment
guid: ce49d91a-9a85-4608-bb37-0dd75a6d4dff
platform: android
minsdk: 3.2.3.GA
minsdk: 6.0.0
2 changes: 1 addition & 1 deletion src/de/marcelpociot/webviewfragment/Webview.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.appcelerator.kroll.KrollDict;
import org.appcelerator.titanium.proxy.TiViewProxy;
import org.appcelerator.titanium.util.Log;
import org.appcelerator.kroll.common.Log;
import org.appcelerator.titanium.util.TiRHelper;
import org.appcelerator.titanium.util.TiRHelper.ResourceNotFoundException;
import org.appcelerator.titanium.view.TiUIView;
Expand Down
2 changes: 1 addition & 1 deletion src/de/marcelpociot/webviewfragment/WebviewProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.util.Log;
import org.appcelerator.kroll.common.Log;
import org.appcelerator.titanium.util.TiConvert;
import org.appcelerator.titanium.util.TiRHelper;
import org.appcelerator.titanium.util.TiRHelper.ResourceNotFoundException;
Expand Down