Skip to content

Commit

Permalink
Merge pull request #6 from plaidev/release/1.0.0
Browse files Browse the repository at this point in the history
release 1.0.0
  • Loading branch information
kota authored May 13, 2022
2 parents 7ee0db0 + 38f8e6f commit 13917dd
Show file tree
Hide file tree
Showing 37 changed files with 68 additions and 14 deletions.
Binary file modified KarteSDK.unitypackage
Binary file not shown.
Binary file removed Unity/.DS_Store
Binary file not shown.
Binary file removed Unity/Assets/.DS_Store
Binary file not shown.
Binary file removed Unity/Assets/Karte/.DS_Store
Binary file not shown.
8 changes: 8 additions & 0 deletions Unity/Assets/Karte/lib.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Unity/Assets/Plugins/Android/io.karte.android.variables-2.2.0.aar
Binary file not shown.
8 changes: 8 additions & 0 deletions Unity/Assets/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Unity/Assets/Resources/BillingMode.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"androidStore":"GooglePlay"}
7 changes: 7 additions & 0 deletions Unity/Assets/Resources/BillingMode.json.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed Unity/Packages/.DS_Store
Binary file not shown.
Binary file removed Unity/Packages/io.karte.unity/.DS_Store
Binary file not shown.
Binary file removed Unity/Packages/io.karte.unity/Editor/.DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions Unity/Packages/io.karte.unity/Editor/KarteDependencies.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<dependencies>
<androidPackages>
<repositories>
<repository>https://jcenter.bintray.com</repository>
<repository>https://repo.maven.apache.org/maven2</repository>
</repositories>
<androidPackage spec="io.karte.android:core:+"> </androidPackage>
<androidPackage spec="io.karte.android:inappmessaging:.+"> </androidPackage>
<androidPackage spec="io.karte.android:inappmessaging:+"> </androidPackage>
<androidPackage spec="io.karte.android:notifications:+"> </androidPackage>
<androidPackage spec="io.karte.android:variables:+"> </androidPackage>
</androidPackages>
Expand Down
Binary file removed Unity/Packages/io.karte.unity/Runtime/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
21 changes: 18 additions & 3 deletions Unity/Packages/io.karte.unity/Runtime/src/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
using Newtonsoft.Json.Linq;
using UnityEngine;

namespace Io.Karte {
/// <summary>
namespace Io.Karte { /// <summary>
/// <para>SDK全体に影響のある機能を扱うクラスです。</para>
/// </summary>
public class App {
Expand All @@ -24,6 +23,8 @@ public class App {
static extern void KRTApp_optOut ();
[DllImport ("__Internal")]
static extern void KRTApp_optIn ();
[DllImport ("__Internal")]
static extern bool KRTAPP_openURL (string url);
#endif

/// <summary>
Expand Down Expand Up @@ -98,7 +99,21 @@ public static void OptIn () {
#elif UNITY_ANDROID && !UNITY_EDITOR
AndroidJavaClass tracker = new AndroidJavaClass ("io.karte.unity.UnityKarteApp");
tracker.CallStatic ("optIn");
#endif
}

/// <summary>
/// KarteでURLを処理します。
/// </summary>
public static bool OpenUrl (string url) {
#if UNITY_IOS && !UNITY_EDITOR
return KRTAPP_openURL (url);
#elif UNITY_ANDROID && !UNITY_EDITOR
AndroidJavaClass tracker = new AndroidJavaClass ("io.karte.unity.UnityKarteApp");
return tracker.CallStatic<bool> ("openUrl", new object[] { url });
# else
return false;
#endif
}
}
}
}
Binary file removed Unity/Packages/io.karte.unity/Samples~/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion Unity/Packages/io.karte.unity/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "io.karte.unity",
"version": "0.0.6",
"version": "1.0.0",
"displayName": "Karte",
"description": "Karte SDK for Unity",
"unity": "2019.4",
Expand Down
7 changes: 4 additions & 3 deletions Unity/ProjectSettings/AndroidResolverDependencies.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<dependencies>
<packages>
<package>io.karte.android:core:+</package>
<package>io.karte.android:inappmessaging:.+</package>
<package>io.karte.android:inappmessaging:+</package>
<package>io.karte.android:notifications:+</package>
<package>io.karte.android:variables:+</package>
</packages>
Expand Down Expand Up @@ -45,8 +45,8 @@
<file>Assets/Plugins/Android/com.google.firebase.firebase-iid-interop-16.0.1.aar</file>
<file>Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-17.0.1.aar</file>
<file>Assets/Plugins/Android/com.google.firebase.firebase-messaging-17.6.0.aar</file>
<file>Assets/Plugins/Android/io.karte.android.core-2.13.0.aar</file>
<file>Assets/Plugins/Android/io.karte.android.inappmessaging-2.11.0.aar</file>
<file>Assets/Plugins/Android/io.karte.android.core-2.17.0.aar</file>
<file>Assets/Plugins/Android/io.karte.android.inappmessaging-2.12.0.aar</file>
<file>Assets/Plugins/Android/io.karte.android.notifications-2.8.0.aar</file>
<file>Assets/Plugins/Android/io.karte.android.variables-2.2.0.aar</file>
<file>Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar</file>
Expand All @@ -59,6 +59,7 @@
<setting name="bundleId" value="io.karte.android.tracker_sample" />
<setting name="explodeAars" value="True" />
<setting name="gradleBuildEnabled" value="True" />
<setting name="gradlePropertiesTemplateEnabled" value="False" />
<setting name="gradleTemplateEnabled" value="False" />
<setting name="installAndroidPackages" value="True" />
<setting name="localMavenRepoDir" value="Assets/GeneratedLocalRepo" />
Expand Down
1 change: 1 addition & 0 deletions Unity/ProjectSettings/GraphicsSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.7
1.0.0
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public String getName() {
@NotNull
@Override
public String getVersion() {
return "0.0.1";
return "1.0.0";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.karte.unity;

import android.app.Activity;
import android.net.Uri;

import com.unity3d.player.UnityPlayer;

Expand Down Expand Up @@ -64,4 +65,10 @@ private static void optOut() {
private static void renewVisitorId() {
KarteApp.renewVisitorId();
}

private static boolean openUrl(String uriStr) {
Uri uri = Uri.parse(uriStr);
Activity activity = UnityPlayer.currentActivity;
return KarteApp.openUrl(uri, activity);
}
}
6 changes: 6 additions & 0 deletions iOSPlugin/KarteSDKPlugin/KarteSDKPlugin/KarteApp.mm
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,10 @@ void KRTApp_registerFCMToken(const char *token) {
NSString *tokenStr = [NSString stringWithCString:token encoding:NSUTF8StringEncoding];
[KRTApp registerFCMToken:tokenStr];
}

int KRTAPP_openURL(const char *rawUrl) {
NSString *urlStr = [NSString stringWithCString:rawUrl encoding:NSUTF8StringEncoding];
NSURL *url = [NSURL URLWithString:urlStr];
return [KRTApp application:[UIApplication sharedApplication] openURL:url];
}
}
2 changes: 1 addition & 1 deletion iOSPlugin/KarteSDKPlugin/KarteSDKPlugin/KartePlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class KartePlugin: NSObject, Library {
}

static var version: String {
"0.0.1"
"1.0.0"
}

static var isPublic: Bool {
Expand Down

0 comments on commit 13917dd

Please sign in to comment.