Skip to content
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.

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

Handling Service Disconnect scenario. Changed library format to AAR #33

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Android CI

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:
runs-on: ubuntu-latest
defaults:
run:
working-directory: JavaPlugin
steps:
- uses: actions/checkout@v3
- name: set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: gradle
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
JavaPlugin/.idea/
JavaPlugin/local.properties
3 changes: 3 additions & 0 deletions JavaPlugin/.idea/.gitignore

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

14 changes: 10 additions & 4 deletions JavaPlugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:4.2.2'
}
}

Expand All @@ -20,21 +20,27 @@ allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 29
buildToolsVersion "29.0.2"
compileSdkVersion 33
buildToolsVersion "30.0.3"

defaultConfig {
minSdkVersion 9
targetSdkVersion 29
targetSdkVersion 33
versionCode 1
versionName "1.0"

consumerProguardFiles 'consumer-rules.pro'
}

compileOptions
{
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}

lintOptions {
tasks.lint.enabled = false
}

buildTypes {
release {
Expand Down
2 changes: 2 additions & 0 deletions JavaPlugin/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Bazaar IAP
-keep class com.bazaar.** { *; }
2 changes: 1 addition & 1 deletion JavaPlugin/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
20 changes: 14 additions & 6 deletions JavaPlugin/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,20 @@
<application>
<activity
android:name=".BazaarIABProxyActivity"
android:label="BazaarIAB" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
android:label="BazaarIAB" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
</activity>
</application>

<queries>
<package android:name="com.farsitel.bazaar" />

<intent>
<action android:name="ir.cafebazaar.pardakht.InAppBillingService.BIND" />
</intent>
</queries>

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="com.farsitel.bazaar.permission.PAY_THROUGH_BAZAAR" />

<meta-data android:name="billing.service" android:value="bazaar.BazaarIabService" />
</manifest>
Loading