gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-android] branch master updated (d32573a -> e6e58ec)

From: gnunet
Subject: [taler-taler-android] branch master updated (d32573a -> e6e58ec)
Date: Mon, 16 May 2022 16:46:32 +0200 
This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository taler-android.

    from d32573a  latest version of wallet core
     new 22e5e80  -upgrade gradle
     new e6e58ec  -migrate away from deprecated library (Kotlin synthetics)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .idea/gradle.xml                                   |  2 +-
 .idea/inspectionProfiles/Project_Default.xml       |  6 ++++
 anastasis-ui/build.gradle                          | 13 ++++----
 anastasis-ui/src/main/AndroidManifest.xml          |  3 +-
 .../java/org/gnu/anastasis/ui/IntroFragment.kt     | 19 ++++++++++--
 .../main/java/org/gnu/anastasis/ui/MainActivity.kt |  8 +++--
 .../gnu/anastasis/ui/identity/IdentityFragment.kt  | 35 +++++++++++++++-------
 build.gradle                                       |  4 +--
 cashier/build.gradle                               | 13 ++++----
 cashier/src/main/AndroidManifest.xml               |  3 +-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 merchant-lib/build.gradle                          |  3 +-
 merchant-lib/src/main/AndroidManifest.xml          |  3 +-
 merchant-terminal/build.gradle                     | 18 +++++------
 merchant-terminal/src/main/AndroidManifest.xml     |  3 +-
 taler-kotlin-android/build.gradle                  |  9 +++---
 taler-kotlin-android/src/main/AndroidManifest.xml  |  3 +-
 wallet/build.gradle                                | 17 ++++++-----
 wallet/src/main/AndroidManifest.xml                |  3 +-
 19 files changed, 101 insertions(+), 66 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f7de5ff..caf1ba4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -20,7 +21,6 @@
             <option value="$PROJECT_DIR$/wallet" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml 
b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..bf1d698
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="UnnecessaryVariable" enabled="false" level="WEAK 
WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/anastasis-ui/build.gradle b/anastasis-ui/build.gradle
index 4a66366..2275496 100644
--- a/anastasis-ui/build.gradle
+++ b/anastasis-ui/build.gradle
@@ -16,18 +16,15 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
     //noinspection GradleDependency
     buildToolsVersion "$build_tools_version"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 1
-        versionName "0.1"
+        targetSdkVersion 32
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -52,6 +49,12 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    buildFeatures {
+        viewBinding true
+    }
+
+    namespace 'org.gnu.anastasis.ui'
 }
 
 dependencies {
diff --git a/anastasis-ui/src/main/AndroidManifest.xml 
b/anastasis-ui/src/main/AndroidManifest.xml
index 9340508..2827271 100644
--- a/anastasis-ui/src/main/AndroidManifest.xml
+++ b/anastasis-ui/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ GNU Taler; see the file COPYING.  If not, see 
<http://www.gnu.org/licenses/>
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    package="org.gnu.anastasis.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android";>
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/IntroFragment.kt 
b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/IntroFragment.kt
index d8f0185..ef2e190 100644
--- a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/IntroFragment.kt
+++ b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/IntroFragment.kt
@@ -22,21 +22,34 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import kotlinx.android.synthetic.main.fragment_intro.*
+import org.gnu.anastasis.ui.databinding.FragmentIntroBinding
 
 class IntroFragment : Fragment() {
 
+    private var _binding: FragmentIntroBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_intro, container, false)
+        _binding = FragmentIntroBinding.inflate(inflater, container, false)
+        val view = binding.root
+        return view
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        button.setOnClickListener {
+        binding.button.setOnClickListener {
             
findNavController().navigate(R.id.action_nav_anastasis_intro_to_nav_anastasis_identity)
         }
     }
diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainActivity.kt 
b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainActivity.kt
index ac355c1..d7870cb 100644
--- a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainActivity.kt
+++ b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainActivity.kt
@@ -22,7 +22,7 @@ import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
-import kotlinx.android.synthetic.main.activity.*
+import org.gnu.anastasis.ui.databinding.ActivityBinding
 
 internal const val PERMISSION_REQUEST_CODE = 1
 
@@ -30,6 +30,8 @@ class MainActivity : AppCompatActivity() {
 
     private lateinit var nav: NavController
 
+    private lateinit var binding: ActivityBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity)
@@ -38,11 +40,11 @@ class MainActivity : AppCompatActivity() {
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as 
NavHostFragment
         nav = navHostFragment.navController
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         val appBarConfiguration = AppBarConfiguration(
             emptySet()
         )
-        toolbar.setupWithNavController(nav, appBarConfiguration)
+        binding.toolbar.setupWithNavController(nav, appBarConfiguration)
     }
 
 }
diff --git 
a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/identity/IdentityFragment.kt 
b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/identity/IdentityFragment.kt
index ad97ab6..73ae629 100644
--- 
a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/identity/IdentityFragment.kt
+++ 
b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/identity/IdentityFragment.kt
@@ -31,9 +31,9 @@ import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import kotlinx.android.synthetic.main.fragment_identity.*
 import org.gnu.anastasis.ui.MainViewModel
 import org.gnu.anastasis.ui.R
+import org.gnu.anastasis.ui.databinding.FragmentIdentityBinding
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
@@ -45,27 +45,40 @@ class AnastasisIdentityFragment : Fragment() {
 
     private val model: MainViewModel by activityViewModels()
 
+    private var _binding: FragmentIdentityBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
-        return inflater.inflate(R.layout.fragment_identity, container, false)
+        _binding = FragmentIdentityBinding.inflate(inflater, container, false)
+        val view = binding.root
+        return view
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         model.currentCountry.observe(viewLifecycleOwner, { country ->
-            countryView.text = country.name
-            if (stub != null) {
-                stub.layoutResource = country.layoutRes
-                stub.inflate()
+            binding.countryView.text = country.name
+            if (binding.stub != null) {
+                binding.stub.layoutResource = country.layoutRes
+                binding.stub.inflate()
             }
         })
-        changeCountryView.setOnClickListener {
+        binding.changeCountryView.setOnClickListener {
             
findNavController().navigate(R.id.action_nav_anastasis_identity_to_nav_change_location)
         }
-        birthDateInput.editText?.setOnClickListener {
+        binding.birthDateInput.editText?.setOnClickListener {
             if (SDK_INT >= 24) {
                 val picker = DatePickerDialog(requireContext())
                 picker.datePicker.maxDate =
@@ -76,14 +89,14 @@ class AnastasisIdentityFragment : Fragment() {
                     }
                     val date = Date(calender.timeInMillis)
                     val dateStr = getDateFormat(requireContext()).format(date)
-                    birthDateInput.editText?.setText(dateStr)
+                    binding.birthDateInput.editText?.setText(dateStr)
                 }
                 picker.show()
             } else {
                 Toast.makeText(requireContext(), "Needs newer phone", 
LENGTH_LONG).show()
             }
         }
-        createIdentifierButton.setOnClickListener {
+        binding.createIdentifierButton.setOnClickListener {
             
findNavController().navigate(R.id.action_nav_anastasis_intro_to_nav_anastasis_authentication)
         }
     }
diff --git a/build.gradle b/build.gradle
index 8967f1f..7c7f3a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext.kotlin_version = '1.5.31'
     ext.ktor_version = "1.6.3"
-    ext.nav_version = "2.3.5"
+    ext.nav_version = '2.4.1'
     ext.material_version = "1.4.0"
     ext.lifecycle_version = "2.4.0"
     ext.constraintlayout_version = "2.1.2"
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 
"androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/cashier/build.gradle b/cashier/build.gradle
index ae7a5a9..1c9c2b6 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -58,18 +58,19 @@ android {
     buildFeatures {
         viewBinding = true
     }
-
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
-    lintOptions {
+    lint {
         abortOnError true
+        ignore 'WrongConstant'
         ignoreWarnings false
-        // TODO remove once com.google.android.material fixed this
-        //      
https://github.com/material-components/material-components-android/issues/504
-        ignore "WrongConstant"
     }
+    namespace 'net.taler.cashier'
+
 }
 
 dependencies {
diff --git a/cashier/src/main/AndroidManifest.xml 
b/cashier/src/main/AndroidManifest.xml
index 1d8b810..3093358 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    package="net.taler.cashier">
+    xmlns:tools="http://schemas.android.com/tools";>
 
     <application
         android:allowBackup="true"
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 7a0ef64..581797b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Aug 27 15:56:47 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle
index f53baa2..d388b27 100644
--- a/merchant-lib/build.gradle
+++ b/merchant-lib/build.gradle
@@ -28,8 +28,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -50,6 +48,7 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+    namespace 'net.taler.merchantlib'
 }
 
 dependencies {
diff --git a/merchant-lib/src/main/AndroidManifest.xml 
b/merchant-lib/src/main/AndroidManifest.xml
index 1408b33..40b4a25 100644
--- a/merchant-lib/src/main/AndroidManifest.xml
+++ b/merchant-lib/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ GNU Taler; see the file COPYING.  If not, see 
<http://www.gnu.org/licenses/>
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    package="net.taler.merchantlib">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android";>
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 5354da5..19b0136 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -48,19 +48,19 @@ android {
             includeAndroidResources = true
         }
     }
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/common.kotlin_module', 
'META-INF/*.kotlin_module']
+        }
+    }
+
 
-    lintOptions {
+    lint {
         abortOnError true
+        ignore 'WrongConstant'
         ignoreWarnings false
-        // TODO remove once com.google.android.material fixed this
-        //      
https://github.com/material-components/material-components-android/issues/504
-        ignore "WrongConstant"
-    }
-
-    packagingOptions {
-        exclude 'META-INF/common.kotlin_module'
-        exclude 'META-INF/*.kotlin_module'
     }
+    namespace 'net.taler.merchantpos'
 }
 
 dependencies {
diff --git a/merchant-terminal/src/main/AndroidManifest.xml 
b/merchant-terminal/src/main/AndroidManifest.xml
index 1518293..eb7940f 100644
--- a/merchant-terminal/src/main/AndroidManifest.xml
+++ b/merchant-terminal/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    package="net.taler.merchantpos">
+    xmlns:tools="http://schemas.android.com/tools";>
 
     <uses-permission android:name="android.permission.NFC" />
 
diff --git a/taler-kotlin-android/build.gradle 
b/taler-kotlin-android/build.gradle
index 4661b09..e45a3a1 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -28,8 +28,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -49,11 +47,14 @@ android {
     buildFeatures {
         viewBinding = true
     }
-
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
+    namespace 'net.taler.common'
+
 }
 
 dependencies {
diff --git a/taler-kotlin-android/src/main/AndroidManifest.xml 
b/taler-kotlin-android/src/main/AndroidManifest.xml
index f74aae6..c1f6146 100644
--- a/taler-kotlin-android/src/main/AndroidManifest.xml
+++ b/taler-kotlin-android/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    package="net.taler.common">
+    xmlns:tools="http://schemas.android.com/tools";>
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 4bc22b9..2aaea01 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -99,19 +99,22 @@ android {
         viewBinding true
         compose true
     }
-
     packagingOptions {
-        doNotStrip '**/*.so'
-        exclude("META-INF/*.kotlin_module")
+        jniLibs {
+            keepDebugSymbols += ['**/*.so']
+        }
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
-    lintOptions {
+    lint {
         abortOnError true
+        ignore 'WrongConstant'
         ignoreWarnings false
-        // TODO remove once com.google.android.material fixed this
-        //      
https://github.com/material-components/material-components-android/issues/504
-        ignore "WrongConstant"
     }
+    namespace 'net.taler.wallet'
+
 }
 
 dependencies {
diff --git a/wallet/src/main/AndroidManifest.xml 
b/wallet/src/main/AndroidManifest.xml
index 963032c..285908a 100644
--- a/wallet/src/main/AndroidManifest.xml
+++ b/wallet/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    package="net.taler.wallet">
+    xmlns:tools="http://schemas.android.com/tools";>
 
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]