Merge pull request #10 from freshbits/release/2.3.3

Release 2.3.3
freshbits · Feb 26, 2023 · 5799a7f · 5799a7f
2 parents 6fe991b + 273b3b2
commit 5799a7f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/android-example-app/app-kotlin/build.gradle b/android-example-app/app-kotlin/build.gradle
@@ -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
@@ -41,6 +43,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'ch.freshbits.pathshare.example'
 }
 
 repositories {
@@ -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'
 }
diff --git a/android-example-app/app-kotlin/src/main/AndroidManifest.xml b/android-example-app/app-kotlin/src/main/AndroidManifest.xml
@@ -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" />
 
@@ -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" />
 

diff --git a/android-example-app/app/build.gradle b/android-example-app/app/build.gradle
@@ -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
@@ -37,6 +39,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'ch.freshbits.pathshare.example'
 }
 
 repositories {
@@ -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'
 }
diff --git a/android-example-app/app/src/main/AndroidManifest.xml b/android-example-app/app/src/main/AndroidManifest.xml
@@ -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" />
 
@@ -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" />
 

diff --git a/android-example-app/build.gradle b/android-example-app/build.gradle
@@ -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"
@@ -17,6 +18,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         jcenter()
         google()
     }

diff --git a/android-example-app/gradle/wrapper/gradle-wrapper.properties b/android-example-app/gradle/wrapper/gradle-wrapper.properties
@@ -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