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

Release 2.3.3 #10

Merged
merged 1 commit into from
Feb 26, 2023
Merged
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
15 changes: 9 additions & 6 deletions android-example-app/app-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 28
compileSdkVersion 31

defaultConfig {
applicationId "ch.freshbits.pathshare.example"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 31
versionCode 132
versionName "2.3.2"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

packagingOptions {
exclude 'META-INF/DEPENDENCIES'
resources {
excludes += ['META-INF/DEPENDENCIES']
}
}


compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
Expand All @@ -41,6 +43,7 @@ android {
minifyEnabled false
}
}
namespace 'ch.freshbits.pathshare.example'
}

repositories {
Expand All @@ -51,6 +54,6 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
testImplementation 'junit:junit:4.13'
implementation 'androidx.appcompat:appcompat:1.2.0-beta01'
implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.2'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.3'
}
6 changes: 3 additions & 3 deletions android-example-app/app-kotlin/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ch.freshbits.pathshare.example">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />

Expand All @@ -12,7 +11,8 @@
android:theme="@style/AppTheme" >
<activity
android:name="ch.freshbits.pathshare.example.MainActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
15 changes: 9 additions & 6 deletions android-example-app/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
compileSdkVersion 31

defaultConfig {
applicationId "ch.freshbits.pathshare.example"
minSdkVersion 25
targetSdkVersion 28
targetSdkVersion 31
versionCode 132
versionName "2.3.2"
}

packagingOptions {
exclude 'META-INF/DEPENDENCIES'
resources {
excludes += ['META-INF/DEPENDENCIES']
}
}


compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
Expand All @@ -37,6 +39,7 @@ android {
minifyEnabled false
}
}
namespace 'ch.freshbits.pathshare.example'
}

repositories {
Expand All @@ -46,6 +49,6 @@ repositories {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.13'
implementation 'androidx.appcompat:appcompat:1.2.0-beta01'
implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.2'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.3'
}
6 changes: 3 additions & 3 deletions android-example-app/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ch.freshbits.pathshare.example" >
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />

Expand All @@ -12,7 +11,8 @@
android:theme="@style/AppTheme" >
<activity
android:name="ch.freshbits.pathshare.example.MainActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
6 changes: 4 additions & 2 deletions android-example-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.10'
ext.kotlin_version = '1.4.10'

repositories {
mavenCentral()
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.android.tools.build:gradle:4.2.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -17,6 +18,7 @@ buildscript {

allprojects {
repositories {
mavenCentral()
jcenter()
google()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip